Mercurial > mplayer.hg

diff stream/network.c @ 30621:300fd6ee0f8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sat, 20 Feb 2010 11:48:41 +0000
parents 74a6c2a3dcce
children 8ae498c98fec
line wrap: on
line diff
--- a/stream/network.c	Sat Feb 20 11:21:51 2010 +0000
+++ b/stream/network.c	Sat Feb 20 11:48:41 2010 +0000
@@ -71,7 +71,11 @@
 #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 },