From bb54613ac1211c73a3614db6b7326d7cd9be39da Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 20 Feb 2010 11:48:41 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/network.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'stream') diff --git a/stream/network.c b/stream/network.c index f9caf16720..38de105961 100644 --- a/stream/network.c +++ b/stream/network.c @@ -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 }, -- cgit v1.2.3