diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-20 11:48:41 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-20 11:48:41 +0000 |
commit | bb54613ac1211c73a3614db6b7326d7cd9be39da (patch) | |
tree | f827010b5722c1df8ee163fd811ee7e93d4324fe /stream/network.c | |
parent | 1bb489848346043ad474224a58acc2c24dfa0cfe (diff) | |
download | mpv-bb54613ac1211c73a3614db6b7326d7cd9be39da.tar.bz2 mpv-bb54613ac1211c73a3614db6b7326d7cd9be39da.tar.xz |
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
Diffstat (limited to 'stream/network.c')
-rw-r--r-- | stream/network.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 }, |