path: root/demux/demux_mkv.c
diff options
authorwm4 <wm4@nowhere>2014-11-28 20:54:51 +0100
committerwm4 <wm4@nowhere>2014-11-28 20:54:51 +0100
commit9a3333e76562b652d9b7f67015a0ca604d7180eb (patch)
tree04d1daca2dc80c7b37574f8b448c66d761ac8c8f /demux/demux_mkv.c
parent77f675a15156519b143d4057e3359e5303a3c5dd (diff)
demux_mkv: remove ancient codec mapping leftovers
All of this is basically due to how MPlayer's codecs.conf worked. It had a demuxer-interface based an AVI, using FourCCs and data structures found in AVI. FourCCs were used to map streams to decoders. For codecs not supported by AVI, "MPlayer internal" FourCCs were made up. codec_tags.c is there to bridge demuxers written against the old API to the mpv one. By now, only demux_mkv.c needs this (because demux_mkv is the only serious demuxer left - preferably, we should use libavformat for mkv too, but I can't see this happening any time soon, because libavformat _still_ doesn't support segment linking). But the codec tables are full of weird stuff automatically extracted from the old codecs.conf tables. Most of it isn't needed for mkv. Remove all custom tags, readd those used by demux_mkv.c internally (see vinfo and mkv_audio_tag tables). The rest is handled by the tables provided by libavformat, which includes AVI and QT tags.
Diffstat (limited to 'demux/demux_mkv.c')
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 8f5884fd1e..6d2e16df1c 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1258,7 +1258,6 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track)
sh->codec = "rawvideo";
} else {
- sh->format = mp_video_fourcc_alias(sh->format);
if (track->v_frate == 0.0)
track->v_frate = 25.0;