From ce6c9ab620b5f0e635dee6c11ccd77b4a7611772 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 28 Nov 2006 10:45:40 +0000 Subject: [PATCH] gst/playback/gstplaybasebin.c: Disable rtsp:// uris for the release, it's not good enough yet. Original commit message from CVS: * gst/playback/gstplaybasebin.c: (setup_source), (gst_play_base_bin_change_state): Disable rtsp:// uris for the release, it's not good enough yet. Remove unused var. --- ChangeLog | 7 +++++++ gst/playback/gstplaybasebin.c | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 761f66cd2a..4b2b97cca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-28 Wim Taymans + + * gst/playback/gstplaybasebin.c: (setup_source), + (gst_play_base_bin_change_state): + Disable rtsp:// uris for the release, it's not good enough yet. + Remove unused var. + 2006-11-26 Wim Taymans * ext/theora/theoradec.c: (gst_theora_dec_reset), diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index 000f3d82a8..1762f190df 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -1373,7 +1373,7 @@ static const gchar *stream_uris[] = { "http://", "mms://", "mmsh://", }; /* blacklisted URIs, we know they will always fail. */ -static const gchar *blacklisted_uris[] = { NULL }; +static const gchar *blacklisted_uris[] = { "rtsp://", NULL }; /* mime types that we don't consider to be media types */ static const gchar *no_media_mimes[] = { @@ -1808,7 +1808,7 @@ subbin_startup_sync_msg (GstBus * bus, GstMessage * msg, gpointer user_data) * all the streams or until a preroll queue has been filled. */ static gboolean -setup_source (GstPlayBaseBin * play_base_bin, gchar ** new_location) +setup_source (GstPlayBaseBin * play_base_bin) { GstElement *subbin = NULL; gboolean is_raw, have_out, is_dynamic; @@ -2414,13 +2414,12 @@ gst_play_base_bin_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; GstPlayBaseBin *play_base_bin; - gchar *new_location = NULL; play_base_bin = GST_PLAY_BASE_BIN (element); switch (transition) { case GST_STATE_CHANGE_READY_TO_PAUSED: - if (!setup_source (play_base_bin, &new_location)) + if (!setup_source (play_base_bin)) goto source_failed; break; default: