summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-06 16:12:58 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-06 16:12:58 +0000
commit78267a4d210cd374c49aa6a56f8e3a16e0aad4b5 (patch)
tree3c1a6c5af4607273d542f3e2873c96d58aeef807
parentabb06b3f11714de8b59f2482a9aec6447653f997 (diff)
downloadmpv-78267a4d210cd374c49aa6a56f8e3a16e0aad4b5.tar.bz2
mpv-78267a4d210cd374c49aa6a56f8e3a16e0aad4b5.tar.xz
Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/stream_ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index 6dee2fcceb..6aee8c63ee 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -108,7 +108,7 @@ const stream_info_t stream_info_ffmpeg = {
"",
"",
open_f,
- { "ffmpeg", NULL },
+ { "ffmpeg", "rtmp", NULL },
NULL,
1 // Urls are an option string
};