diff options
-rw-r--r-- | ext/opencv/gstfacedetect.c | 4 | ||||
-rw-r--r-- | ext/opencv/gstmotioncells.c | 2 | ||||
-rw-r--r-- | gst/asfmux/gstasfmux.c | 4 | ||||
-rw-r--r-- | gst/autoconvert/gstautovideoconvert.c | 8 | ||||
-rw-r--r-- | gst/interlace/gstinterlace.c | 6 | ||||
-rw-r--r-- | gst/pnm/gstpnmenc.c | 2 | ||||
-rw-r--r-- | gst/rawparse/README | 2 | ||||
-rw-r--r-- | win32/common/config.h | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/ext/opencv/gstfacedetect.c b/ext/opencv/gstfacedetect.c index fa4385701..0d7f61f8b 100644 --- a/ext/opencv/gstfacedetect.c +++ b/ext/opencv/gstfacedetect.c @@ -56,10 +56,10 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch-0.10 autovideosrc ! decodebin2 ! colorspace ! facedetect ! colorspace ! xvimagesink + * gst-launch-0.10 autovideosrc ! decodebin2 ! colorspace ! facedetect ! videoconvert ! xvimagesink * ]| Detect and show faces * |[ - * gst-launch-0.10 autovideosrc ! video/x-raw-yuv,width=320,height=240 ! colorspace ! facedetect min-size-width=60 min-size-height=60 ! colorspace ! xvimagesink + * gst-launch-0.10 autovideosrc ! video/x-raw,width=320,height=240 ! videoconvert ! facedetect min-size-width=60 min-size-height=60 ! colorspace ! xvimagesink * ]| Detect large faces on a smaller image * * </refsect2> diff --git a/ext/opencv/gstmotioncells.c b/ext/opencv/gstmotioncells.c index 04d5de34e..d58976028 100644 --- a/ext/opencv/gstmotioncells.c +++ b/ext/opencv/gstmotioncells.c @@ -50,7 +50,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch-0.10 videotestsrc pattern=18 ! videorate ! videoscale ! video/x-raw-yuv,width=320,height=240,framerate=5/1 ! ffmpegcolorspace ! motioncells ! ffmpegcolorspace ! xvimagesink + * gst-launch-0.10 videotestsrc pattern=18 ! videorate ! videoscale ! video/x-raw,width=320,height=240,framerate=5/1 ! videoconvert ! motioncells ! videoconvert ! xvimagesink * ]| * </refsect2> */ diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c index 128ead268..2e894c593 100644 --- a/gst/asfmux/gstasfmux.c +++ b/gst/asfmux/gstasfmux.c @@ -36,10 +36,10 @@ * <para>(write everything in one line, without the backslash characters)</para> * |[ * gst-launch videotestsrc num-buffers=250 \ - * ! "video/x-raw-yuv,format=(fourcc)I420,framerate=(fraction)25/1" ! ffenc_wmv2 \ + * ! "video/x-raw,format=(string)I420,framerate=(fraction)25/1" ! ffenc_wmv2 \ * ! asfmux name=mux ! filesink location=test.asf \ * audiotestsrc num-buffers=440 ! audioconvert \ - * ! "audio/x-raw-int,rate=44100" ! ffenc_wmav2 ! mux. + * ! "audio/x-raw,rate=44100" ! ffenc_wmav2 ! mux. * ]| This creates an ASF file containing an WMV video stream * with a test picture and WMA audio stream of a test sound. * diff --git a/gst/autoconvert/gstautovideoconvert.c b/gst/autoconvert/gstautovideoconvert.c index 1f6206543..43ece5d34 100644 --- a/gst/autoconvert/gstautovideoconvert.c +++ b/gst/autoconvert/gstautovideoconvert.c @@ -20,11 +20,11 @@ /* * test autovideoconvert: * if rgb2bayer is present - * gst-launch videotestsrc num-buffers=2 ! "video/x-raw-rgb,width=100,height=100,framerate=10/1" ! autovideoconvert ! "video/x-raw-bayer,width=100,height=100,format=bggr,framerate=10/1" ! fakesink -v + * gst-launch videotestsrc num-buffers=2 ! "video/x-raw,width=100,height=100,framerate=10/1" ! autovideoconvert ! "video/x-raw-bayer,width=100,height=100,format=bggr,framerate=10/1" ! fakesink -v * if bayer2rgb is present - * gst-launch videotestsrc num-buffers=2 ! "video/x-raw-bayer,width=100,height=100,format=bggr,framerate=10/1" ! autovideoconvert ! "video/x-raw-rgb,width=100,height=100,framerate=10/1" ! fakesink -v - * test with ffmpegvideoconvert - * gst-launch videotestsrc num-buffers=2 ! "video/x-raw-rgb,bpp=32,width=100,height=100,framerate=10/1" ! autovideoconvert ! "video/x-raw-rgb,bpp=16,width=100,height=100,framerate=10/1" ! fakesink -v + * gst-launch videotestsrc num-buffers=2 ! "video/x-raw-bayer,width=100,height=100,format=bggr,framerate=10/1" ! autovideoconvert ! "video/x-raw,width=100,height=100,framerate=10/1" ! fakesink -v + * test with videoconvert + * gst-launch videotestsrc num-buffers=2 ! "video/x-raw,format=RGBx,width=100,height=100,framerate=10/1" ! autovideoconvert ! "video/x-raw,format=RGB16,width=100,height=100,framerate=10/1" ! fakesink -v */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/gst/interlace/gstinterlace.c b/gst/interlace/gstinterlace.c index 2dfb6235b..86e5a9d94 100644 --- a/gst/interlace/gstinterlace.c +++ b/gst/interlace/gstinterlace.c @@ -34,15 +34,15 @@ * two interlaced fields as one progressive frame. * |[ * gst-launch -v filesrc location=/path/to/file ! decodebin ! videorate ! - * videoscale ! video/x-raw-yuv,format=\(fourcc\)I420,width=720,height=480, + * videoscale ! video/x-raw,format=\(string\)I420,width=720,height=480, * framerate=60000/1001,pixel-aspect-ratio=11/10 ! * interlace top-field-first=false ! ... * ]| * This pipeline converts a progressive video stream into an interlaced * stream suitable for standard definition NTSC. * |[ - * gst-launch -v videotestsrc pattern=ball ! video/x-raw-yuv, - * format=\(fourcc\)I420,width=720,height=480,framerate=24000/1001, + * gst-launch -v videotestsrc pattern=ball ! video/x-raw, + * format=\(string\)I420,width=720,height=480,framerate=24000/1001, * pixel-aspect-ratio=11/10 ! interlace pattern=2:3 ! * ... * ]| diff --git a/gst/pnm/gstpnmenc.c b/gst/pnm/gstpnmenc.c index 02490c204..8e623097b 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-gray" ! pnmenc ascii=true ! filesink location=test.pnm + * gst-launch videotestsrc num_buffers=1 ! ffmpegcolorspace ! "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/rawparse/README b/gst/rawparse/README index 0a698c90e..417e92680 100644 --- a/gst/rawparse/README +++ b/gst/rawparse/README @@ -10,7 +10,7 @@ Creating example data ===================== gst-launch videotestsrc num_buffers=300 ! \ - video/x-raw-yuv,format=\(fourcc\)I420,width=320,height=240 ! \ + video/x-raw,format=\(string\)I420,width=320,height=240 ! \ filesink location=raw diff --git a/win32/common/config.h b/win32/common/config.h index 78932dbe8..5debb1ab1 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -24,7 +24,7 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins source release" +#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins git" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -199,7 +199,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.11.94" +#define VERSION "0.11.94.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ |