summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/assrender/gstassrender.c2
-rw-r--r--ext/cog/gstcogscale.c4
-rw-r--r--ext/gsettings/gstgsettingsvideosink.c2
-rw-r--r--ext/gsettings/gstgsettingsvideosrc.c2
-rw-r--r--ext/kate/gstkatetiger.c4
-rw-r--r--ext/opencv/gstedgedetect.c2
-rw-r--r--ext/opencv/gstfaceblur.c2
-rw-r--r--ext/opencv/gsttemplatematch.c2
-rwxr-xr-xext/resindvd/resin-play2
-rw-r--r--ext/rsvg/gstrsvgdec.c2
-rw-r--r--ext/rsvg/gstrsvgoverlay.c6
-rw-r--r--ext/teletextdec/gstteletextdec.c2
-rw-r--r--ext/zbar/gstzbar.c4
-rw-r--r--gst/asfmux/gstasfmux.c2
-rw-r--r--gst/coloreffects/gstchromahold.c2
-rw-r--r--gst/coloreffects/gstcoloreffects.c2
-rw-r--r--gst/faceoverlay/gstfaceoverlay.c6
-rw-r--r--gst/fieldanalysis/gstfieldanalysis.c2
-rw-r--r--gst/freeze/gstfreeze.c2
-rw-r--r--gst/gaudieffects/blur-example.py3
-rw-r--r--gst/gaudieffects/burn-example.py3
-rw-r--r--gst/hls/gsthlsdemux.c2
-rw-r--r--gst/jp2kdecimator/gstjp2kdecimator.c2
-rw-r--r--gst/nuvdemux/gstnuvdemux.c2
-rw-r--r--gst/pnm/gstpnmdec.c2
-rw-r--r--gst/pnm/gstpnmenc.c2
-rw-r--r--gst/scaletempo/gstscaletempo.c2
-rw-r--r--gst/videomeasure/gstvideomeasure_ssim.c2
-rw-r--r--gst/videosignal/gstvideoanalyse.c2
-rw-r--r--gst/videosignal/gstvideodetect.c2
-rw-r--r--sys/uvch264/gstuvch264_src.c2
-rw-r--r--tests/examples/capsfilter/capsfilter1.c2
-rw-r--r--tests/examples/directfb/gstdfb.c2
-rw-r--r--tests/examples/opencv/gstmotioncells_dynamic_test.c6
-rw-r--r--tests/icles/metadata_editor.c4
35 files changed, 45 insertions, 47 deletions
diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c
index efa536f05..07335bcbd 100644
--- a/ext/assrender/gstassrender.c
+++ b/ext/assrender/gstassrender.c
@@ -26,7 +26,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch -v filesrc location=/path/to/mkv ! matroskademux name=d ! queue ! mp3parse ! mad ! audioconvert ! autoaudiosink d. ! queue ! ffdec_h264 ! ffmpegcolorspace ! r. d. ! queue ! "application/x-ass" ! assrender name=r ! ffmpegcolorspace ! autovideosink
+ * gst-launch -v filesrc location=/path/to/mkv ! matroskademux name=d ! queue ! mp3parse ! mad ! audioconvert ! autoaudiosink d. ! queue ! ffdec_h264 ! videoconvert ! r. d. ! queue ! "application/x-ass" ! assrender name=r ! videoconvert ! autovideosink
* ]| This pipeline demuxes a Matroska file with h.264 video, MP3 audio and embedded ASS subtitles and renders the subtitles on top of the video.
* </refsect2>
*/
diff --git a/ext/cog/gstcogscale.c b/ext/cog/gstcogscale.c
index 52585ac90..dcc8aad31 100644
--- a/ext/cog/gstcogscale.c
+++ b/ext/cog/gstcogscale.c
@@ -20,7 +20,7 @@
/**
* SECTION:element-videoscale
- * @see_also: videorate, ffmpegcolorspace
+ * @see_also: videorate, videoconvert
*
* <refsect2>
* <para>
@@ -37,7 +37,7 @@
* <title>Example pipelines</title>
* <para>
* <programlisting>
- * gst-launch -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! ffmpegcolorspace ! videoscale ! ximagesink
+ * gst-launch -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! videoconvert ! videoscale ! ximagesink
* </programlisting>
* Decode an Ogg/Theora and display the video using ximagesink. Since
* ximagesink cannot perform scaling, the video scaling will be performed by
diff --git a/ext/gsettings/gstgsettingsvideosink.c b/ext/gsettings/gstgsettingsvideosink.c
index e225ec14e..fd5735b01 100644
--- a/ext/gsettings/gstgsettingsvideosink.c
+++ b/ext/gsettings/gstgsettingsvideosink.c
@@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch videotestsrc ! ffmpegcolorspace ! videoscale ! gsettingsvideosink
+ * gst-launch videotestsrc ! videoconvert ! videoscale ! gsettingsvideosink
* ]| Play on configured videosink
* </refsect2>
*/
diff --git a/ext/gsettings/gstgsettingsvideosrc.c b/ext/gsettings/gstgsettingsvideosrc.c
index 6c2a5b03e..d617d7779 100644
--- a/ext/gsettings/gstgsettingsvideosrc.c
+++ b/ext/gsettings/gstgsettingsvideosrc.c
@@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch gsettingsvideosrc ! ffmpegcolorspace ! videoscale ! autovideosink
+ * gst-launch gsettingsvideosrc ! videoconvert ! videoscale ! autovideosink
* ]| Play from configured videosrc
* </refsect2>
*/
diff --git a/ext/kate/gstkatetiger.c b/ext/kate/gstkatetiger.c
index fda3f7c12..ad2931436 100644
--- a/ext/kate/gstkatetiger.c
+++ b/ext/kate/gstkatetiger.c
@@ -65,9 +65,9 @@
* <programlisting>
* gst-launch \
* filesrc location=video.ogg ! oggdemux name=demux \
- * demux. ! queue ! theoradec ! ffmpegcolorspace ! tiger name=tiger \
+ * demux. ! queue ! theoradec ! videoconvert ! tiger name=tiger \
* demux. ! queue ! kateparse ! tiger. \
- * tiger. ! ffmpegcolorspace ! autovideosink
+ * tiger. ! videoconvert ! autovideosink
* </programlisting>
* </para>
* </refsect2>
diff --git a/ext/opencv/gstedgedetect.c b/ext/opencv/gstedgedetect.c
index 68840f30b..fd1ae957b 100644
--- a/ext/opencv/gstedgedetect.c
+++ b/ext/opencv/gstedgedetect.c
@@ -51,7 +51,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! edgedetect ! ffmpegcolorspace ! xvimagesink
+ * gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! edgedetect ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/
diff --git a/ext/opencv/gstfaceblur.c b/ext/opencv/gstfaceblur.c
index 8820b0309..7b523f750 100644
--- a/ext/opencv/gstfaceblur.c
+++ b/ext/opencv/gstfaceblur.c
@@ -51,7 +51,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! faceblur ! ffmpegcolorspace ! xvimagesink
+ * gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! faceblur ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/
diff --git a/ext/opencv/gsttemplatematch.c b/ext/opencv/gsttemplatematch.c
index 58a5e8aa7..a9c3f82c1 100644
--- a/ext/opencv/gsttemplatematch.c
+++ b/ext/opencv/gsttemplatematch.c
@@ -52,7 +52,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! templatematch template=/path/to/file.jpg ! ffmpegcolorspace ! xvimagesink
+ * gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! templatematch template=/path/to/file.jpg ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/
diff --git a/ext/resindvd/resin-play b/ext/resindvd/resin-play
index 1aa4e87c5..5066e5b48 100755
--- a/ext/resindvd/resin-play
+++ b/ext/resindvd/resin-play
@@ -7,7 +7,7 @@ else
fi
gst-launch rsndvdbin name=dvd "$DEVICE_OPT" \
- dvdspu name=spu ! ffmpegcolorspace ! videoscale ! ximagesink force-aspect-ratio=true \
+ dvdspu name=spu ! videoconvert ! videoscale ! ximagesink force-aspect-ratio=true \
dvd. ! queue max-size-buffers=3 max-size-bytes=0 ! spu.video \
dvd. ! spu.subpicture \
dvd. ! audioconvert ! autoaudiosink
diff --git a/ext/rsvg/gstrsvgdec.c b/ext/rsvg/gstrsvgdec.c
index 13b7baa6f..a1602d10c 100644
--- a/ext/rsvg/gstrsvgdec.c
+++ b/ext/rsvg/gstrsvgdec.c
@@ -24,7 +24,7 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
- * gst-launch filesrc location=image.svg ! rsvgdec ! imagefreeze ! ffmpegcolorspace ! autovideosink
+ * gst-launch filesrc location=image.svg ! rsvgdec ! imagefreeze ! videoconvert ! autovideosink
* ]| render and show a svg image.
* </refsect2>
*/
diff --git a/ext/rsvg/gstrsvgoverlay.c b/ext/rsvg/gstrsvgoverlay.c
index 5c9efba74..82cebeb00 100644
--- a/ext/rsvg/gstrsvgoverlay.c
+++ b/ext/rsvg/gstrsvgoverlay.c
@@ -45,13 +45,13 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
- * gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay location=foo.svg ! ffmpegcolorspace ! autovideosink
+ * gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay location=foo.svg ! videoconvert ! autovideosink
* ]| specifies the SVG location through the filename property.
* |[
- * gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay name=overlay ! ffmpegcolorspace ! autovideosink filesrc location=foo.svg ! image/svg ! overlay.data_sink
+ * gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay name=overlay ! videoconvert ! autovideosink filesrc location=foo.svg ! image/svg ! overlay.data_sink
* ]| does the same by feeding data through the data_sink pad. You can also specify the SVG data itself as parameter:
* |[
- * gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay data='&lt;svg viewBox="0 0 800 600"&gt;&lt;image x="80%" y="80%" width="10%" height="10%" xlink:href="foo.jpg" /&gt;&lt;/svg&gt;' ! ffmpegcolorspace ! autovideosink
+ * gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay data='&lt;svg viewBox="0 0 800 600"&gt;&lt;image x="80%" y="80%" width="10%" height="10%" xlink:href="foo.jpg" /&gt;&lt;/svg&gt;' ! videoconvert ! autovideosink
* ]|
* </refsect2>
*/
diff --git a/ext/teletextdec/gstteletextdec.c b/ext/teletextdec/gstteletextdec.c
index 93f51460b..fbac7d617 100644
--- a/ext/teletextdec/gstteletextdec.c
+++ b/ext/teletextdec/gstteletextdec.c
@@ -27,7 +27,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch -v -m filesrc location=recording.mpeg ! mpegtsdemux ! private/teletext ! teletextdec ! ffmpegcolorspace ! ximagesink
+ * gst-launch -v -m filesrc location=recording.mpeg ! mpegtsdemux ! private/teletext ! teletextdec ! videoconvert ! ximagesink
* ]|
* </refsect2>
*/
diff --git a/ext/zbar/gstzbar.c b/ext/zbar/gstzbar.c
index b1abd0e95..d31e44124 100644
--- a/ext/zbar/gstzbar.c
+++ b/ext/zbar/gstzbar.c
@@ -61,10 +61,10 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
- * gst-launch -m v4l2src ! ffmpegcolorspace ! zbar ! ffmpegcolorspace ! xvimagesink
+ * gst-launch -m v4l2src ! videoconvert ! zbar ! videoconvert ! xvimagesink
* ]| This pipeline will detect barcodes and send them as messages.
* |[
- * gst-launch -m v4l2src ! tee name=t ! queue ! ffmpegcolorspace ! zbar ! fakesink t. ! queue ! xvimagesink
+ * gst-launch -m v4l2src ! tee name=t ! queue ! videoconvert ! zbar ! fakesink t. ! queue ! xvimagesink
* ]| Same as above, but running the filter on a branch to keep the display in color
* </refsect2>
*/
diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c
index 2e894c593..0526e3cd7 100644
--- a/gst/asfmux/gstasfmux.c
+++ b/gst/asfmux/gstasfmux.c
@@ -62,7 +62,7 @@
* |[
* gst-launch udpsrc port=3333 ! "caps_from_rtpasfpay_at_sender" \
* ! rtpasfdepay ! decodebin2 name=d ! queue \
- * ! ffmpegcolorspace ! autovideosink \
+ * ! videoconvert ! autovideosink \
* d. ! queue ! audioconvert ! autoaudiosink
* ]|
* </refsect2>
diff --git a/gst/coloreffects/gstchromahold.c b/gst/coloreffects/gstchromahold.c
index a2cd5d5cd..cd3d977f4 100644
--- a/gst/coloreffects/gstchromahold.c
+++ b/gst/coloreffects/gstchromahold.c
@@ -31,7 +31,7 @@
* |[
* gst-launch videotestsrc pattern=smpte75 ! \
* chromahold target-r=0 target-g=0 target-b=255 ! \
- * ffmpegcolorspace ! autovideosink \
+ * videoconvert ! autovideosink \
* ]| This pipeline only keeps the red color.
*/
diff --git a/gst/coloreffects/gstcoloreffects.c b/gst/coloreffects/gstcoloreffects.c
index 623a22913..86dd8d891 100644
--- a/gst/coloreffects/gstcoloreffects.c
+++ b/gst/coloreffects/gstcoloreffects.c
@@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch -v videotestsrc ! coloreffects preset=heat ! ffmpegcolorspace !
+ * gst-launch -v videotestsrc ! coloreffects preset=heat ! videoconvert !
* autovideosink
* ]| This pipeline shows the effect of coloreffects on a test stream.
* </refsect2>
diff --git a/gst/faceoverlay/gstfaceoverlay.c b/gst/faceoverlay/gstfaceoverlay.c
index ce59b42fb..6ca7e404f 100644
--- a/gst/faceoverlay/gstfaceoverlay.c
+++ b/gst/faceoverlay/gstfaceoverlay.c
@@ -50,7 +50,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch autovideosrc ! ffmpegcolorspace ! faceoverlay location=/path/to/gnome-video-effects/pixmaps/bow.svg x=-5 y=-15 w=0.3 h=0.1 ! ffmpegcolorspace ! autovideosink
+ * gst-launch autovideosrc ! videoconvert ! faceoverlay location=/path/to/gnome-video-effects/pixmaps/bow.svg x=-5 y=-15 w=0.3 h=0.1 ! videoconvert ! autovideosink
* ]|
* </refsect2>
*/
@@ -108,7 +108,7 @@ gst_face_overlay_create_children (GstFaceOverlay * filter)
GstElement *csp, *face_detect, *overlay;
GstPad *pad;
- csp = gst_element_factory_make ("ffmpegcolorspace", NULL);
+ csp = gst_element_factory_make ("videoconvert", NULL);
face_detect = gst_element_factory_make ("facedetect", NULL);
overlay = gst_element_factory_make ("rsvgoverlay", NULL);
@@ -141,7 +141,7 @@ missing_element:
{
/* clean up */
if (csp == NULL)
- GST_ERROR_OBJECT (filter, "ffmpegcolorspace element not found");
+ GST_ERROR_OBJECT (filter, "videoconvert element not found");
else
gst_object_unref (csp);
diff --git a/gst/fieldanalysis/gstfieldanalysis.c b/gst/fieldanalysis/gstfieldanalysis.c
index 7597c1567..56063f62e 100644
--- a/gst/fieldanalysis/gstfieldanalysis.c
+++ b/gst/fieldanalysis/gstfieldanalysis.c
@@ -51,7 +51,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch -v uridecodebin uri=/path/to/foo.bar ! fieldanalysis ! deinterlace ! ffmpegcolorspace ! autovideosink
+ * gst-launch -v uridecodebin uri=/path/to/foo.bar ! fieldanalysis ! deinterlace ! videoconvert ! autovideosink
* ]| This pipeline will analyse a video stream with default metrics and thresholds and output progressive frames.
* </refsect2>
*/
diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c
index 432a0277e..d101b06d8 100644
--- a/gst/freeze/gstfreeze.c
+++ b/gst/freeze/gstfreeze.c
@@ -24,7 +24,7 @@
* <title>Example launch line</title>
* <para>
* |[
- * gst-launch-0.10 filesrc location=gnome-home.png blocksize=4135 ! pngdec ! freeze ! ffmpegcolorspace ! xvimagesink
+ * gst-launch-0.10 filesrc location=gnome-home.png blocksize=4135 ! pngdec ! freeze ! videoconvert ! xvimagesink
* ]| Produces a video stream from one picture.
* </para>
* </refsect2>
diff --git a/gst/gaudieffects/blur-example.py b/gst/gaudieffects/blur-example.py
index 63920ec84..db19e8199 100644
--- a/gst/gaudieffects/blur-example.py
+++ b/gst/gaudieffects/blur-example.py
@@ -5,8 +5,7 @@ import gst
p = gst.parse_launch ("""
v4l2src !
- ffmpegcolorspace ! queue ! video/x-raw-yuv,width=320,height=240,framerate=30/1 ! gaussianblur qos=true name=vf ! ffmpegcolorspace !
- timeoverlay ! xvimagesink
+ videoconvert ! queue ! video/x-raw-yuv,width=320,height=240,framerate=30/1 ! gaussianblur qos=true name=vf ! videoconvert ! timeoverlay ! xvimagesink
""")
m = p.get_by_name ("vf")
diff --git a/gst/gaudieffects/burn-example.py b/gst/gaudieffects/burn-example.py
index 01080b909..ec1b4a1a0 100644
--- a/gst/gaudieffects/burn-example.py
+++ b/gst/gaudieffects/burn-example.py
@@ -5,8 +5,7 @@ import gst
p = gst.parse_launch ("""
v4l2src !
- ffmpegcolorspace ! queue ! video/x-raw-rgb,width=320,height=240,framerate=30/1 ! burn qos=true name=vf ! ffmpegcolorspace !
- timeoverlay ! xvimagesink
+ videoconvert ! queue ! video/x-raw-rgb,width=320,height=240,framerate=30/1 ! burn qos=true name=vf ! videoconvert ! timeoverlay ! xvimagesink
""")
m = p.get_by_name ("vf")
diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 51d4d68af..404edcc9f 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -30,7 +30,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch souphttpsrc location=http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8 ! hlsdemux ! decodebin2 ! ffmpegcolorspace ! videoscale ! autovideosink
+ * gst-launch souphttpsrc location=http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8 ! hlsdemux ! decodebin2 ! videoconvert ! videoscale ! autovideosink
* ]|
* </refsect2>
*
diff --git a/gst/jp2kdecimator/gstjp2kdecimator.c b/gst/jp2kdecimator/gstjp2kdecimator.c
index 9315ac789..99d4446d6 100644
--- a/gst/jp2kdecimator/gstjp2kdecimator.c
+++ b/gst/jp2kdecimator/gstjp2kdecimator.c
@@ -27,7 +27,7 @@
* |[
* gst-launch -v videotestsrc num-buffers=1 ! jp2kenc ! \
* gstjp2kdecimator max-decomposition-levels=2 ! jp2kdec ! \
- * ffmpegcolorspace ! autovideosink
+ * videoconvert ! autovideosink
* ]|
* This pipelines encodes a test image to JPEG2000, only keeps 3 decomposition levels
* decodes the decimated image again and shows it on the screen.
diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c
index b59b8e704..5eecace8c 100644
--- a/gst/nuvdemux/gstnuvdemux.c
+++ b/gst/nuvdemux/gstnuvdemux.c
@@ -31,7 +31,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch filesrc test.nuv ! nuvdemux name=demux demux.audio_00 ! decodebin ! audioconvert ! audioresample ! autoaudiosink demux.video_00 ! queue ! decodebin ! ffmpegcolorspace ! videoscale ! autovideosink
+ * gst-launch filesrc test.nuv ! nuvdemux name=demux demux.audio_00 ! decodebin ! audioconvert ! audioresample ! autoaudiosink demux.video_00 ! queue ! decodebin ! videoconvert ! videoscale ! autovideosink
* ]| Play (parse and decode) an .nuv file and try to output it to
* an automatically detected soundcard and videosink. If the NUV file contains
* compressed audio or video data, this will only work if you have the
diff --git a/gst/pnm/gstpnmdec.c b/gst/pnm/gstpnmdec.c
index 56dcb8e32..ee43f5923 100644
--- a/gst/pnm/gstpnmdec.c
+++ b/gst/pnm/gstpnmdec.c
@@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch filesrc location=test.pnm ! pnmdec ! ffmpegcolorspace ! autovideosink
+ * gst-launch filesrc location=test.pnm ! pnmdec ! videoconvert ! autovideosink
* ]| The above pipeline reads a pnm file and renders it to the screen.
* </refsect2>
*/
diff --git a/gst/pnm/gstpnmenc.c b/gst/pnm/gstpnmenc.c
index 8e623097b..46e9ef43d 100644
--- a/gst/pnm/gstpnmenc.c
+++ b/gst/pnm/gstpnmenc.c
@@ -27,7 +27,7 @@
* <refsect>
* <title>Example launch line</title>
* |[
- * gst-launch videotestsrc num_buffers=1 ! ffmpegcolorspace ! "video/x-raw,format=GRAY8" ! pnmenc ascii=true ! filesink location=test.pnm
+ * gst-launch videotestsrc num_buffers=1 ! videoconvert ! "video/x-raw,format=GRAY8" ! pnmenc ascii=true ! filesink location=test.pnm
* ]| The above pipeline writes a test pnm file (ASCII encoding).
* </refsect2>
*/
diff --git a/gst/scaletempo/gstscaletempo.c b/gst/scaletempo/gstscaletempo.c
index fa25528a7..a2ec38ee7 100644
--- a/gst/scaletempo/gstscaletempo.c
+++ b/gst/scaletempo/gstscaletempo.c
@@ -33,7 +33,7 @@
* |[
* filesrc location=media.ext ! decodebin name=d \
* d. ! queue ! audioconvert ! audioresample ! scaletempo ! audioconvert ! audioresample ! autoaudiosink \
- * d. ! queue ! ffmpegcolorspace ! autovideosink
+ * d. ! queue ! videoconvert ! autovideosink
* ]|
* OR
* |[
diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c
index 69533c1b4..3b6941818 100644
--- a/gst/videomeasure/gstvideomeasure_ssim.c
+++ b/gst/videomeasure/gstvideomeasure_ssim.c
@@ -38,7 +38,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch ssim name=ssim ssim.src0 ! ffmpegcolorspace ! glimagesink filesrc
+ * gst-launch ssim name=ssim ssim.src0 ! videoconvert ! glimagesink filesrc
* location=orig.avi ! decodebin2 ! ssim.original filesrc location=compr.avi !
* decodebin2 ! ssim.modified0
* ]| This pipeline produces a video stream that consists of SSIM frames.
diff --git a/gst/videosignal/gstvideoanalyse.c b/gst/videosignal/gstvideoanalyse.c
index 7ca6626c2..fc7a04fa2 100644
--- a/gst/videosignal/gstvideoanalyse.c
+++ b/gst/videosignal/gstvideoanalyse.c
@@ -73,7 +73,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch -m videotestsrc ! videoanalyse ! ffmpegcolorspace ! ximagesink
+ * gst-launch -m videotestsrc ! videoanalyse ! videoconvert ! ximagesink
* ]| This pipeline emits messages to the console for each frame that has been analysed.
* </refsect2>
*
diff --git a/gst/videosignal/gstvideodetect.c b/gst/videosignal/gstvideodetect.c
index 09de8b676..7dafd3808 100644
--- a/gst/videosignal/gstvideodetect.c
+++ b/gst/videosignal/gstvideodetect.c
@@ -95,7 +95,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch videotestsrc ! videodetect ! ffmpegcolorspace ! ximagesink
+ * gst-launch videotestsrc ! videodetect ! videoconvert ! ximagesink
* ]|
* </refsect2>
*
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index 04bbee27e..26b50b088 100644
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -119,7 +119,7 @@ enum
static guint _signals[LAST_SIGNAL];
/* Default values */
-#define DEFAULT_COLORSPACE_NAME "ffmpegcolorspace"
+#define DEFAULT_COLORSPACE_NAME "videoconvert"
#define DEFAULT_JPEG_DECODER_NAME "jpegdec"
#define DEFAULT_NUM_CLOCK_SAMPLES 0
#define DEFAULT_NUM_BUFFERS -1
diff --git a/tests/examples/capsfilter/capsfilter1.c b/tests/examples/capsfilter/capsfilter1.c
index a59f728e5..861256b6f 100644
--- a/tests/examples/capsfilter/capsfilter1.c
+++ b/tests/examples/capsfilter/capsfilter1.c
@@ -52,7 +52,7 @@ main (gint argc, gchar * argv[])
queue = gst_element_factory_make ("queue", "queue");
mpeg2dec = gst_element_factory_make ("mpeg2dec", "mpeg2dec");
g_return_val_if_fail (mpeg2dec, -1);
- colorspace = gst_element_factory_make ("ffmpegcolorspace", "colorspace");
+ colorspace = gst_element_factory_make ("videoconvert", "colorspace");
g_return_val_if_fail (colorspace, -1);
videosink = gst_element_factory_make (DEFAULT_VIDEOSINK, "videosink");
g_return_val_if_fail (videosink, -1);
diff --git a/tests/examples/directfb/gstdfb.c b/tests/examples/directfb/gstdfb.c
index dcbc4bd8a..0232772b9 100644
--- a/tests/examples/directfb/gstdfb.c
+++ b/tests/examples/directfb/gstdfb.c
@@ -333,7 +333,7 @@ main (int argc, char *argv[])
v_queue = gst_element_factory_make ("queue", "v_queue");
v_scale = gst_element_factory_make ("videoscale", "v_scale");
- cs = gst_element_factory_make ("ffmpegcolorspace", "cs");
+ cs = gst_element_factory_make ("videoconvert", "cs");
v_sink = gst_element_factory_make ("dfbvideosink", "v_sink");
g_object_set (v_sink, "surface", window_surface3, NULL);
diff --git a/tests/examples/opencv/gstmotioncells_dynamic_test.c b/tests/examples/opencv/gstmotioncells_dynamic_test.c
index 56e359f9c..ad779cc87 100644
--- a/tests/examples/opencv/gstmotioncells_dynamic_test.c
+++ b/tests/examples/opencv/gstmotioncells_dynamic_test.c
@@ -104,7 +104,7 @@ setProperty (GstElement * mcells, char *property, char *prop_value, GType type,
}
}
-// gst-launch v4l2src ! videoscale ! videorate ! capsfilter "caps=video/x-raw-yuv,width=320,height=240,framerate=10/1" ! ffmpegcolorspace ! motioncells ! ffmpegcolorspace ! xvimagesink
+// gst-launch v4l2src ! videoscale ! videorate ! capsfilter "caps=video/x-raw-yuv,width=320,height=240,framerate=10/1" ! videoconvert ! motioncells ! videoconvert ! xvimagesink
int
main (int argc, char *argv[])
{
@@ -143,9 +143,9 @@ main (int argc, char *argv[])
decodebin = gst_element_factory_make ("decodebin", "decode");
else
decodebin = NULL;
- colorsp0 = gst_element_factory_make ("ffmpegcolorspace", "colorspace0");
+ colorsp0 = gst_element_factory_make ("videoconvert", "colorspace0");
mcells = gst_element_factory_make ("motioncells", "mcells");
- colorsp1 = gst_element_factory_make ("ffmpegcolorspace", "colorspace1");
+ colorsp1 = gst_element_factory_make ("videoconvert", "colorspace1");
sink = gst_element_factory_make ("xvimagesink", "xv-image-sink");
if (!pipeline || !source || !videor || !videos || !capsf || !colorsp0
|| !mcells || !colorsp1 || !sink) {
diff --git a/tests/icles/metadata_editor.c b/tests/icles/metadata_editor.c
index a51aa81b5..7a469030b 100644
--- a/tests/icles/metadata_editor.c
+++ b/tests/icles/metadata_editor.c
@@ -1050,7 +1050,7 @@ me_gst_setup_capture_pipeline (const gchar * src_file, const gchar * dest_file,
gst_source = gst_element_factory_make ("v4l2src", NULL);
else
gst_source = gst_element_factory_make ("videotestsrc", NULL);
- gst_video_convert = gst_element_factory_make ("ffmpegcolorspace", NULL);
+ gst_video_convert = gst_element_factory_make ("videoconvert", NULL);
gst_image_enc = gst_element_factory_make ("jpegenc", NULL);
gst_metadata_mux = gst_element_factory_make ("metadatamux", NULL);
gst_file_sink = gst_element_factory_make ("filesink", NULL);
@@ -1238,7 +1238,7 @@ me_gst_setup_view_pipeline (const gchar * filename)
else
gst_image_dec = gst_element_factory_make ("jpegdec", NULL);
gst_video_scale = gst_element_factory_make ("videoscale", NULL);
- gst_video_convert = gst_element_factory_make ("ffmpegcolorspace", NULL);
+ gst_video_convert = gst_element_factory_make ("videoconvert", NULL);
gst_video_sink = gst_element_factory_make ("gdkpixbufsink", NULL);
if (gst_video_sink == NULL) {