diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
| commit | 0e1b7765be878491565cf5e471f22b15e106164c (patch) | |
| tree | 422e500c289335182a2a64934dcabf10b95e32dc /libmpdemux/mp_taglists.c | |
| parent | a9618c1c6fe9424dfaeb1677348e0382d7252554 (diff) | |
| parent | dcfd043ea8d0c46929aad78596314d837c290d39 (diff) | |
| download | mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2 mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz | |
Merge svn changes up to r29644
Diffstat (limited to 'libmpdemux/mp_taglists.c')
| -rw-r--r-- | libmpdemux/mp_taglists.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 7874721987..6ae9235191 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -26,8 +26,6 @@ #include "ffmpeg_files/taglists.c" static const struct mp_AVCodecTag mp_wav_tags[] = { - { CODEC_ID_RA_144, MKTAG('1', '4', '_', '4')}, - { CODEC_ID_RA_288, MKTAG('2', '8', '_', '8')}, { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, @@ -45,6 +43,8 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')}, { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')}, + { CODEC_ID_RA_144, MKTAG('1', '4', '_', '4')}, + { CODEC_ID_RA_288, MKTAG('2', '8', '_', '8')}, { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')}, { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')}, @@ -58,7 +58,14 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { const struct mp_AVCodecTag *mp_wav_taglists[] = {mp_ff_codec_wav_tags, mp_wav_tags, 0}; -static const struct mp_AVCodecTag mp_wav_override_tags[] = { +static const struct mp_AVCodecTag mp_codecid_override_tags[] = { + { CODEC_ID_AAC, MKTAG('M', 'P', '4', 'A')}, + { CODEC_ID_AC3, 0x2000}, + { CODEC_ID_DTS, 0x2001}, + { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, + { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, + { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, + { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_U8, 1}, { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, @@ -67,10 +74,12 @@ static const struct mp_AVCodecTag mp_wav_override_tags[] = { { CODEC_ID_PCM_S24LE, 1}, { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2')}, { CODEC_ID_PCM_S32LE, 1}, + { CODEC_ID_MP2, 0x50}, + { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'G', '2')}, { 0, 0 }, }; -const struct mp_AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0}; +const struct mp_AVCodecTag *mp_codecid_override_taglists[] = {mp_codecid_override_tags, 0}; static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, @@ -84,6 +93,7 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, + { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')}, @@ -97,7 +107,6 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, { CODEC_ID_WS_VQA, MKTAG('V', 'Q', 'A', 'V')}, { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, - { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, { 0, 0 }, }; |