summaryrefslogtreecommitdiffstats
path: root/stream/network.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-05 17:35:48 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-05 17:35:48 +0000
commitde41d79d2ca369552e880d3a9b00a90de9c46261 (patch)
treedd6ede5688ee1d38edbcd0a9aeefa8178733181c /stream/network.c
parent847aa91f4336b7c3ec00a75ec77e6d474e3c3d31 (diff)
downloadmpv-de41d79d2ca369552e880d3a9b00a90de9c46261.tar.bz2
mpv-de41d79d2ca369552e880d3a9b00a90de9c46261.tar.xz
Prefer libavformat over our own mov demuxer also for video/quicktime
mime-type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30517 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/network.c')
-rw-r--r--stream/network.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/stream/network.c b/stream/network.c
index e90b4a4b90..d6b8079276 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -68,6 +68,11 @@ int network_ipv4_only_proxy = 0;
const mime_struct_t mime_type_table[] = {
+#ifdef CONFIG_LIBAVFORMAT
+ // Flash Video
+ { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED},
+ { "video/quicktime", DEMUXER_TYPE_LAVF_PREFERRED },
+#endif
// MP3 streaming, some MP3 streaming server answer with audio/mpeg
{ "audio/mpeg", DEMUXER_TYPE_AUDIO },
// MPEG streaming
@@ -101,10 +106,6 @@ const mime_struct_t mime_type_table[] = {
// NullSoft Streaming Video
{ "video/nsv", DEMUXER_TYPE_NSV},
{ "misc/ultravox", DEMUXER_TYPE_NSV},
-#ifdef CONFIG_LIBAVFORMAT
- // Flash Video
- { "video/x-flv", DEMUXER_TYPE_LAVF},
-#endif
{ NULL, DEMUXER_TYPE_UNKNOWN},
};