From 6903319c6628ebd794c0f817e533276e60a194b3 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Fri, 7 Sep 2012 19:39:46 +0300 Subject: stream_ffmpeg: handle rtsp:// URLs by default, add lavf:// Make stream_ffmpeg handle rtsp:// URLs by default, without requiring ffmpeg://rtsp://. Previously (after removal of other rtsp implementations) rtsp:// fell back to using HTTP, which was unlikely to work. Also add lavf:// as an alternative to ffmpeg:// to force the stream implementation. Since libavformat can come from Libav rather than FFmpeg, using the ffmpeg name in the prefix is misleading. --- stream/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/stream.c') diff --git a/stream/stream.c b/stream/stream.c index 837378fcae..9b64deb4a9 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, -- cgit v1.2.3