diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-31 05:21:12 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-31 05:21:12 +0000 |
commit | aa16e6ca7d57bb525bf42e64eddf0b4b344c977a (patch) | |
tree | fa27994191b56e56fa00f85597f1ccd9bd914771 /libmpdemux/mp_taglists.c | |
parent | 7a6ab8a711fba305cb29f13baee12663d9045385 (diff) | |
download | mpv-aa16e6ca7d57bb525bf42e64eddf0b4b344c977a.tar.bz2 mpv-aa16e6ca7d57bb525bf42e64eddf0b4b344c977a.tar.xz |
cosmetics: alphabetically order lists
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29595 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/mp_taglists.c')
-rw-r--r-- | libmpdemux/mp_taglists.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 1e7b1708a0..bb6fd5f431 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -22,8 +22,6 @@ #include "libavformat/riff.h" static const 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')}, @@ -41,6 +39,8 @@ static const 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', ' ')}, @@ -55,6 +55,9 @@ static const AVCodecTag mp_wav_tags[] = { const struct AVCodecTag *mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0}; static const AVCodecTag mp_codecid_override_tags[] = { + { CODEC_ID_AC3, 0x2000}, + { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, + { 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')}, @@ -63,11 +66,8 @@ static const AVCodecTag mp_codecid_override_tags[] = { { CODEC_ID_PCM_S24LE, 1}, { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2')}, { CODEC_ID_PCM_S32LE, 1}, - { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, { CODEC_ID_MP2, 0x50}, - { CODEC_ID_AC3, 0x2000}, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'G', '2')}, - { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { 0, 0 }, }; @@ -86,6 +86,7 @@ static const 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')}, @@ -99,7 +100,6 @@ static const 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 }, }; |