summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-09 14:28:44 +0000
committeraurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-09 14:28:44 +0000
commit9500a8cc9ce9e1eb8cea2837a64b6b1079a0a697 (patch)
tree01a3eadc9e8ba1aa5a2d5a2111dd5535529a0de9 /libmpdemux
parentd60e8b3d723ce50c8fa6789956f145f530d95703 (diff)
downloadmpv-9500a8cc9ce9e1eb8cea2837a64b6b1079a0a697.tar.bz2
mpv-9500a8cc9ce9e1eb8cea2837a64b6b1079a0a697.tar.xz
revert r27551 which break much more things than it fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27555 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 868b100b68..e4798539d3 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
};