From de41d79d2ca369552e880d3a9b00a90de9c46261 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 5 Feb 2010 17:35:48 +0000
Subject: 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
---
 stream/network.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'stream')

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},
 };
 
-- 
cgit v1.2.3