summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-08 21:26:24 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-08 21:26:24 +0000
commita4b5780c2f2f69b429d0023eebc9300d27b04627 (patch)
tree09ce203fd50795b3b38137f3086d86b8051a3bd0 /libmpdemux
parent212b51434ff5838441d52ab88ecfefac154e20eb (diff)
downloadmpv-a4b5780c2f2f69b429d0023eebc9300d27b04627.tar.bz2
mpv-a4b5780c2f2f69b429d0023eebc9300d27b04627.tar.xz
Use internal demuxer for Matroska files for now
Change the default demuxer back to the internal one at least until the current lavf breakage with SSA/ASS subtitles is sorted out. There have also been quite a few other regressions so maybe the lavf demuxer should be tested a bit more before trying to make it the default again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27551 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index e4798539d3..868b100b68 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -183,7 +183,6 @@ static const char *preferred_list[] = {
"mov,mp4,m4a,3gp,3g2,mj2",
"mpc",
"mpc8",
- "matroska",
NULL
};