[MPlayer-cvslog] r30517 - trunk/stream/network.c

[reimar]

Author: reimar
Date: Fri Feb  5 18:35:48 2010
New Revision: 30517

Log:
Prefer libavformat over our own mov demuxer also for video/quicktime
mime-type.

Modified:
   trunk/stream/network.c

Modified: trunk/stream/network.c
==============================================================================
--- trunk/stream/network.c	Fri Feb  5 18:20:21 2010	(r30516)
+++ trunk/stream/network.c	Fri Feb  5 18:35:48 2010	(r30517)
@@ -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},
 };