[MPlayer-cvslog] r29595 - trunk/libmpdemux/mp_taglists.c

[diego]

Author: diego
Date: Mon Aug 31 07:21:12 2009
New Revision: 29595

Log:
cosmetics: alphabetically order lists

Modified:
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Mon Aug 31 01:28:38 2009	(r29594)
+++ trunk/libmpdemux/mp_taglists.c	Mon Aug 31 07:21:12 2009	(r29595)
@@ -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_overr
     { 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 },
 };