diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-09 14:45:50 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-09 14:45:50 +0000 |
| commit | 4768e340ab03d2bdc4ea2be9381be3db18127efa (patch) | |
| tree | c98500926871258367659cd3bd83bd2504a93707 /libmpdemux | |
| parent | 9500a8cc9ce9e1eb8cea2837a64b6b1079a0a697 (diff) | |
| download | mpv-4768e340ab03d2bdc4ea2be9381be3db18127efa.tar.bz2 mpv-4768e340ab03d2bdc4ea2be9381be3db18127efa.tar.xz | |
Make internal Matroska demuxer default again
Undo Aurelien's previous commit which made the lavf demuxer the
default. SSA/ASS subtitles do not work properly with the lavf demuxer
at the moment. That's much more important than any issues with the
internal demuxer. The internal demuxer must remain the default at least
until the subtitle issues are resolved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27556 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
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 }; |