From 063f553275cf9d74a44d328ae2312a8f09f0ddf3 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Thu, 25 Jun 2015 10:57:25 +0100 Subject: [PATCH] docs: decodebin2 -> decodebin --- gst/imagefreeze/gstimagefreeze.c | 2 +- gst/matroska/matroska-demux.c | 2 +- tests/examples/shapewipe/shapewipe-example.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c index 6b75ed9f8a..43d495478f 100644 --- a/gst/imagefreeze/gstimagefreeze.c +++ b/gst/imagefreeze/gstimagefreeze.c @@ -28,7 +28,7 @@ * * Example launch line * |[ - * gst-launch-1.0 -v filesrc location=some.png ! decodebin2 ! imagefreeze ! autovideosink + * gst-launch-1.0 -v filesrc location=some.png ! decodebin ! imagefreeze ! autovideosink * ]| This pipeline shows a still frame stream of a PNG file. * */ diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 76fd8b830e..3ec8c704b8 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -4602,7 +4602,7 @@ pause: /* perform EOS logic */ /* If we were in the headers, make sure we send no-more-pads. - This will ensure decodebin2 does not get stuck thinking + This will ensure decodebin does not get stuck thinking the chain is not complete yet, and waiting indefinitely. */ if (G_UNLIKELY (demux->common.state == GST_MATROSKA_READ_STATE_HEADER)) { if (demux->common.src->len == 0) { diff --git a/tests/examples/shapewipe/shapewipe-example.c b/tests/examples/shapewipe/shapewipe-example.c index a61926de25..98d734af1a 100644 --- a/tests/examples/shapewipe/shapewipe-example.c +++ b/tests/examples/shapewipe/shapewipe-example.c @@ -83,7 +83,7 @@ main (gint argc, gchar ** argv) pipeline_string = g_strdup_printf - ("videotestsrc ! video/x-raw,format=(string)AYUV,width=640,height=480 ! shapewipe name=shape border=%f ! videomixer name=mixer ! videoconvert ! autovideosink filesrc location=%s ! typefind ! decodebin2 ! videoconvert ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw,format=(string)AYUV,width=640,height=480 ! queue ! mixer.", + ("videotestsrc ! video/x-raw,format=(string)AYUV,width=640,height=480 ! shapewipe name=shape border=%f ! videomixer name=mixer ! videoconvert ! autovideosink filesrc location=%s ! typefind ! decodebin ! videoconvert ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw,format=(string)AYUV,width=640,height=480 ! queue ! mixer.", border, argv[1]); pipeline = gst_parse_launch (pipeline_string, NULL);