Commit ce6c9ab6 authored by Wim Taymans's avatar Wim Taymans
Browse files

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.
parent 0a5978df
2006-11-28 Wim Taymans <wim@fluendo.com>
* 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 <wim@fluendo.com> 2006-11-26 Wim Taymans <wim@fluendo.com>
   
* ext/theora/theoradec.c: (gst_theora_dec_reset), * ext/theora/theoradec.c: (gst_theora_dec_reset),
...@@ -1373,7 +1373,7 @@ static const gchar *stream_uris[] = { "http://", "mms://", "mmsh://", ...@@ -1373,7 +1373,7 @@ static const gchar *stream_uris[] = { "http://", "mms://", "mmsh://",
}; };
/* blacklisted URIs, we know they will always fail. */ /* 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 */ /* mime types that we don't consider to be media types */
static const gchar *no_media_mimes[] = { static const gchar *no_media_mimes[] = {
...@@ -1808,7 +1808,7 @@ subbin_startup_sync_msg (GstBus * bus, GstMessage * msg, gpointer user_data) ...@@ -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. * all the streams or until a preroll queue has been filled.
*/ */
static gboolean static gboolean
setup_source (GstPlayBaseBin * play_base_bin, gchar ** new_location) setup_source (GstPlayBaseBin * play_base_bin)
{ {
GstElement *subbin = NULL; GstElement *subbin = NULL;
gboolean is_raw, have_out, is_dynamic; gboolean is_raw, have_out, is_dynamic;
...@@ -2414,13 +2414,12 @@ gst_play_base_bin_change_state (GstElement * element, GstStateChange transition) ...@@ -2414,13 +2414,12 @@ gst_play_base_bin_change_state (GstElement * element, GstStateChange transition)
{ {
GstStateChangeReturn ret; GstStateChangeReturn ret;
GstPlayBaseBin *play_base_bin; GstPlayBaseBin *play_base_bin;
gchar *new_location = NULL;
play_base_bin = GST_PLAY_BASE_BIN (element); play_base_bin = GST_PLAY_BASE_BIN (element);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!setup_source (play_base_bin, &new_location)) if (!setup_source (play_base_bin))
goto source_failed; goto source_failed;
break; break;
default: default:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment