From 1877d7933ec44b392291c3c1ddd220e8dc66758d Mon Sep 17 00:00:00 2001 From: Stephen Hutchinson Date: Thu, 14 Feb 2013 07:23:26 -0500 Subject: 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. --- demux/codec_tags.c | 1 + 1 file changed, 1 insertion(+) (limited to 'demux/codec_tags.c') 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"}, -- cgit v1.2.3