diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /stream/network.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
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 5802b85c67..3a0a18b622 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 }, |