summaryrefslogtreecommitdiffstats
path: root/demux/codec_tags.c
diff options
context:
space:
mode:
Diffstat (limited to 'demux/codec_tags.c')
-rw-r--r--demux/codec_tags.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index 429da5582c..2af450ad07 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -103,6 +103,8 @@ static const struct mp_codec_tag mp_audio_codec_tags[] = {
{0x3 , "pcm"}, // lavf: pcm_f32le
{0xfffe , "pcm"},
// ------- internal mplayer FourCCs ------
+ {MKTAG('O', 'p', 'u', 's'), "opus"}, // demux_mkv.c
+ {MKTAG('a', 'L', 'a', 'C'), "alac"}, // demux_mkv.c
{MKTAG('S', 'a', 'd', 'x'), "adpcm_adx"},
{MKTAG('A', 'M', 'V', 'A'), "adpcm_ima_amv"},
{MKTAG('R', 'o', 'Q', 'A'), "roq_dpcm"},
@@ -308,6 +310,7 @@ static const struct mp_codec_tag mp_video_codec_tags[] = {
{MKTAG('I', 'N', 'P', 'V'), "interplayvideo"},
{MKTAG('V', 'Q', 'A', 'V'), "ws_vqa"},
{MKTAG('C', '9', '3', 'V'), "c93"},
+ {MKTAG('V', 'P', '9', '0'), "vp9"},
{0},
};
@@ -349,7 +352,7 @@ static const char *lookup_tag(const struct mp_codec_tag *mp_table,
}
const struct AVCodecTag *av_tags[] = {av_table, NULL};
int id = av_codec_get_id(av_tags, tag);
- return id == CODEC_ID_NONE ? NULL : mp_codec_from_av_codec_id(id);
+ return id == AV_CODEC_ID_NONE ? NULL : mp_codec_from_av_codec_id(id);
}
void mp_set_video_codec_from_tag(struct sh_video *sh)