From 9df6134df1fdf4a0de52ab33f81db2d32e13eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 16 Jun 2005 14:56:33 +0000 Subject: [PATCH] gst/gsturi.c: The show must go on, even if the element did not accept the uri. Fixes endless loop as witnessed in #30... Original commit message from CVS: * gst/gsturi.c: (gst_element_make_from_uri): The show must go on, even if the element did not accept the uri. Fixes endless loop as witnessed in #307804. * tools/gst-launch.1.in: Update mp3->ogg transcoding pipeline in examples section to use rawvorbisenc and oggmux. --- ChangeLog | 10 ++++++++++ gst/gsturi.c | 1 + tools/gst-launch.1.in | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d233d4572f..0c084d44a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-06-16 Tim-Philipp Müller + + * gst/gsturi.c: (gst_element_make_from_uri): + The show must go on, even if the element did not accept + the uri. Fixes endless loop as witnessed in #307804. + + * tools/gst-launch.1.in: + Update mp3->ogg transcoding pipeline in examples section + to use rawvorbisenc and oggmux. + 2005-06-16 Stefan Kost * gst/gstelement.c: (gst_element_link_pads_filtered): diff --git a/gst/gsturi.c b/gst/gsturi.c index fce5e454dc..6d75f3776e 100644 --- a/gst/gsturi.c +++ b/gst/gsturi.c @@ -488,6 +488,7 @@ gst_element_make_from_uri (const GstURIType type, const gchar * uri, gst_object_unref (GST_OBJECT (ret)); ret = NULL; } + walk = walk->next; } g_list_free (possibilities); diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in index 59efa87580..90c241d16e 100644 --- a/tools/gst-launch.1.in +++ b/tools/gst-launch.1.in @@ -247,7 +247,7 @@ Use GNOME\-VFS to play an mp3 file located on an SMB server .B Format conversion .B - gst\-launch filesrc location=music.mp3 ! mad ! vorbisenc ! filesink location=music.ogg + gst\-launch filesrc location=music.mp3 ! mad ! audioscale ! audioconvert ! rawvorbisenc ! oggmux ! filesink location=music.ogg .br Convert an mp3 music file to an Ogg Vorbis file