diff options
Diffstat (limited to 'stream/stream.c')
-rw-r--r-- | stream/stream.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/stream.c b/stream/stream.c index 837378fcae..8ae334880b 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -93,6 +93,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_CDDA &stream_info_cdda, #endif + &stream_info_ffmpeg, // use for rstp:// before http fallback #ifdef CONFIG_NETWORKING &stream_info_netstream, &stream_info_http1, @@ -128,7 +129,6 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_LIBBLURAY &stream_info_bluray, #endif - &stream_info_ffmpeg, &stream_info_null, &stream_info_mf, @@ -155,6 +155,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, if (m_option_parse(&url_opt, bstr0("stream url"), bstr0(filename), arg) < 0) { mp_tmsg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); m_struct_free(desc,arg); + *ret = STREAM_ERROR; return NULL; } } |