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

[reimar]

Author: reimar
Date: Sat Feb 20 12:48:41 2010
New Revision: 30663

Log:
Fix mov reference files: for video/quicktime mime do not force a demuxer
but do autodetection. This tries lavf first but will also try native demuxer
for reference files where open fails for the lavf demuxer.

Modified:
   trunk/stream/network.c

Modified: trunk/stream/network.c
==============================================================================
--- trunk/stream/network.c	Sat Feb 20 12:21:51 2010	(r30662)
+++ trunk/stream/network.c	Sat Feb 20 12:48:41 2010	(r30663)
@@ -71,7 +71,11 @@ 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 },
+	// do not force any demuxer in this case!
+	// we want the lavf demuxer to be tried first (happens automatically anyway),
+	// but for mov reference files to work we must also try
+	// the native demuxer if lavf fails.
+	{ "video/quicktime", 0 },
 #endif
 	// MP3 streaming, some MP3 streaming server answer with audio/mpeg
 	{ "audio/mpeg", DEMUXER_TYPE_AUDIO },