path: root/demux/codec_tags.c
diff options
authorStephen Hutchinson <>2013-02-14 07:23:26 -0500
committerwm4 <wm4@nowhere>2013-03-14 00:07:28 +0100
commit1877d7933ec44b392291c3c1ddd220e8dc66758d (patch)
treeaf353473db23d145e042971fb4895c7e3b9f0380 /demux/codec_tags.c
parent21e4f1680c379407d77f0ac976aa8236f8227be0 (diff)
demux_mkv: Support playing Opus streams in Matroska
FFmpeg recently changed how it writes Opus-in-Matroska to match the A_OPUS/EXPERIMENTAL name that mkvmerge uses, with the caveat that things will change and compatibility with old files can get worked out when the spec is finalized. This adds both A_OPUS and A_OPUS/EXPERIMENTAL so that *hopefully* it can play both the newer files that use A_OPUS/EXPERIMENTAL, and older ones muxed by FFmpeg that were simply A_OPUS, since this is also what FFmpeg seems to be doing to handle the situation.
Diffstat (limited to 'demux/codec_tags.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index d1a6cee65f..8f535ba487 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -103,6 +103,7 @@ 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('S', 'a', 'd', 'x'), "adpcm_adx"},
{MKTAG('A', 'M', 'V', 'A'), "adpcm_ima_amv"},
{MKTAG('R', 'o', 'Q', 'A'), "roq_dpcm"},