summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-26 21:12:48 +0000
committeraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-26 21:12:48 +0000
commit6c675482ffdc6f7e0aa27151b466d84504cfb40b (patch)
tree7239349c08969411a46b30708b4d5909750a4d0a /libmpdemux
parentc1751adcc1be958329ae13fda482b155a7d424c5 (diff)
downloadmpv-6c675482ffdc6f7e0aa27151b466d84504cfb40b.tar.bz2
mpv-6c675482ffdc6f7e0aa27151b466d84504cfb40b.tar.xz
prefer libavformat to demux matroska files
I can't spot any regression anymore. If you find one, please tell me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index e6ffbfb8c6..21e53465de 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -183,6 +183,7 @@ static const char *preferred_list[] = {
"mov,mp4,m4a,3gp,3g2,mj2",
"mpc",
"mpc8",
+ "matroska",
NULL
};