diff options
author | wm4 <wm4@nowhere> | 2013-07-07 23:54:11 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-07 23:54:11 +0200 |
commit | af0c41e162725b0edcd6c3d066a2dbef05a3b896 (patch) | |
tree | 607f2aa997815accec54e838cde124df845c7f38 /demux/extension.c | |
parent | 8781e5a55c5f250e7c637a4cc9c4d8f91b227314 (diff) | |
download | mpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.bz2 mpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.xz |
Remove old demuxers
Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does
better than them (except in rare corner cases), and the demuxers have
a bad influence on the rest of the code. Often they don't output
proper packets, and require additional audio and video parsing. Most
work only in --no-correct-pts mode.
Remove them to facilitate further cleanups.
Diffstat (limited to 'demux/extension.c')
-rw-r--r-- | demux/extension.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/demux/extension.c b/demux/extension.c index 71b5bf8f4d..30cb592b9f 100644 --- a/demux/extension.c +++ b/demux/extension.c @@ -38,17 +38,17 @@ static struct { const char *extension; int demuxer_type; } extensions_table[] = { - { "vob", DEMUXER_TYPE_MPEG_PS }, - { "m2v", DEMUXER_TYPE_MPEG_PS }, - { "avi", DEMUXER_TYPE_AVI }, - { "asx", DEMUXER_TYPE_ASF }, - { "asf", DEMUXER_TYPE_ASF }, - { "wmv", DEMUXER_TYPE_ASF }, - { "wma", DEMUXER_TYPE_ASF }, + { "vob", DEMUXER_TYPE_LAVF }, + { "m2v", DEMUXER_TYPE_LAVF }, + { "avi", DEMUXER_TYPE_LAVF }, + { "asx", DEMUXER_TYPE_LAVF }, + { "asf", DEMUXER_TYPE_LAVF }, + { "wmv", DEMUXER_TYPE_LAVF }, + { "wma", DEMUXER_TYPE_LAVF }, { "rm", DEMUXER_TYPE_LAVF }, { "rmvb", DEMUXER_TYPE_LAVF }, { "ra", DEMUXER_TYPE_LAVF }, - { "y4m", DEMUXER_TYPE_Y4M }, + { "y4m", DEMUXER_TYPE_LAVF }, { "mp3", DEMUXER_TYPE_LAVF }, { "wav", DEMUXER_TYPE_LAVF }, { "flac", DEMUXER_TYPE_LAVF }, @@ -63,12 +63,9 @@ static struct { { "it", DEMUXER_TYPE_LAVF }, { "mid", DEMUXER_TYPE_LAVF }, { "midi", DEMUXER_TYPE_LAVF }, - { "nsv", DEMUXER_TYPE_NSV }, - { "nsa", DEMUXER_TYPE_NSV }, - { "mpc", DEMUXER_TYPE_MPC }, -#ifdef CONFIG_WIN32DLL - { "avs", DEMUXER_TYPE_AVS }, -#endif + { "nsv", DEMUXER_TYPE_LAVF }, + { "nsa", DEMUXER_TYPE_LAVF }, + { "mpc", DEMUXER_TYPE_LAVF }, { "302", DEMUXER_TYPE_LAVF }, { "264", DEMUXER_TYPE_LAVF }, { "26l", DEMUXER_TYPE_LAVF }, |