summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 19:44:02 +0000
committeraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 19:44:02 +0000
commit9be39d06401362f3eb8aa12b22e7fde130defa2b (patch)
tree6a4dbe002c659eecdd004c8a6c1aa628adb4618b /libmpdemux
parente123aecb4825db7da60e67eae3a01d9222593d95 (diff)
downloadmpv-9be39d06401362f3eb8aa12b22e7fde130defa2b.tar.bz2
mpv-9be39d06401362f3eb8aa12b22e7fde130defa2b.tar.xz
Switch mkv demuxing to lavf by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31294 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 bc1781c8a0..dad7208c3d 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -212,6 +212,7 @@ static const char * const preferred_list[] = {
"gxf",
"nut",
"nuv",
+ "matroska",
"mov,mp4,m4a,3gp,3g2,mj2",
"mpc",
"mpc8",