diff options
| author | wm4 <wm4@nowhere> | 2012-08-18 11:13:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:02 +0200 |
| commit | 8ca3ec1562986c0681261cad407e05578eda45fd (patch) | |
| tree | 0822a5c95e2b0e26ec9497e6826a98db8704dfa2 /libmpdemux/extension.c | |
| parent | fc2ea37694a6e508fe6ebc56711b11be592c7a8d (diff) | |
| download | mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.bz2 mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.xz | |
libmpdemux: remove demux_real, demux_viv, demux_audio
libavformat replaces demux_audio completely. I don't know/care what
vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works
slightly better, with a different set of bugs.
Diffstat (limited to 'libmpdemux/extension.c')
| -rw-r--r-- | libmpdemux/extension.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 8c4602bab4..6845c36af3 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -45,16 +45,14 @@ static struct { { "asf", DEMUXER_TYPE_ASF }, { "wmv", DEMUXER_TYPE_ASF }, { "wma", DEMUXER_TYPE_ASF }, - { "viv", DEMUXER_TYPE_VIVO }, - { "vivo", DEMUXER_TYPE_VIVO }, - { "rm", DEMUXER_TYPE_REAL }, - { "rmvb", DEMUXER_TYPE_REAL }, - { "ra", DEMUXER_TYPE_REAL }, + { "rm", DEMUXER_TYPE_LAVF }, + { "rmvb", DEMUXER_TYPE_LAVF }, + { "ra", DEMUXER_TYPE_LAVF }, { "y4m", DEMUXER_TYPE_Y4M }, - { "mp3", DEMUXER_TYPE_AUDIO }, - { "wav", DEMUXER_TYPE_AUDIO }, - { "flac", DEMUXER_TYPE_AUDIO }, - { "fla", DEMUXER_TYPE_AUDIO }, + { "mp3", DEMUXER_TYPE_LAVF }, + { "wav", DEMUXER_TYPE_LAVF }, + { "flac", DEMUXER_TYPE_LAVF }, + { "fla", DEMUXER_TYPE_LAVF }, { "ogg", DEMUXER_TYPE_LAVF }, { "ogm", DEMUXER_TYPE_LAVF }, // { "pls", DEMUXER_TYPE_PLAYLIST }, |