1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00

demux/mp_taglists: Move Bink audio tags to override list

Some versions of lavf abuse codec_tag for passing Bink version
information to the decoder, which broke detection based on codec tag
(though this has already stopped again in latest Libav). Move bink
audio codec IDs from mp_wav_tags to mp_codecid_override_tags so that
codec tags are completely ignored for them.
This commit is contained in:
Anton Khirnov 2011-07-06 14:55:50 +02:00 committed by Uoti Urpala
parent 2670ceeb81
commit 00ec1a40f1

View File

@ -34,8 +34,6 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')},
{ CODEC_ID_ADPCM_XA, MKTAG('P', 'S', 'X', 'A')},
{ CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)},
{ CODEC_ID_BINKAUDIO_DCT, MKTAG('B', 'A', 'U', '1')},
{ CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')},
{ CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')},
{ CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')},
{ CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
@ -73,6 +71,8 @@ static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
#endif
{ CODEC_ID_AC3, 0x2000},
{ CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')},
{ CODEC_ID_BINKAUDIO_DCT, MKTAG('B', 'A', 'U', '1')},
{ CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')},
{ CODEC_ID_DTS, 0x2001},
{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')},
{ CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},