Trivial, Cosmetics

[ffmpeg] / libavformat / isom.c

diff --git a/libavformat/isom.c b/libavformat/isom.c
index d4f16dd0bfecf49890d6b34135343242c9dca416..879135446f5dd3971f193885f083bbcb40439569 100644 (file)
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -28,29 +28,31 @@
 /* http://www.mp4ra.org */
 /* ordered by muxing preference */
 const AVCodecTag ff_mp4_obj_type[] = {
-    { CODEC_ID_MPEG4     ,  32 },
-    { CODEC_ID_H264      ,  33 },
-    { CODEC_ID_AAC       ,  64 },
-    { CODEC_ID_MPEG2VIDEO,  97 }, /* MPEG2 Main */
-    { CODEC_ID_MPEG2VIDEO,  96 }, /* MPEG2 Simple */
-    { CODEC_ID_MPEG2VIDEO,  98 }, /* MPEG2 SNR */
-    { CODEC_ID_MPEG2VIDEO,  99 }, /* MPEG2 Spatial */
-    { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */
-    { CODEC_ID_MPEG2VIDEO, 101 }, /* MPEG2 422 */
-    { CODEC_ID_AAC       , 102 }, /* MPEG2 AAC Main */
-    { CODEC_ID_AAC       , 103 }, /* MPEG2 AAC Low */
-    { CODEC_ID_AAC       , 104 }, /* MPEG2 AAC SSR */
-    { CODEC_ID_MP3       , 107 }, /* 11172-3 */
-    { CODEC_ID_MP2       , 107 }, /* 11172-3 */
-    { CODEC_ID_MP3       , 105 }, /* 13818-3 */
-    { CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */
-    { CODEC_ID_MJPEG     , 108 }, /* 10918-1 */
-    { CODEC_ID_PNG       , 109 },
-    { CODEC_ID_JPEG2000  , 110 }, /* 15444-1 */
-    { CODEC_ID_VC1       , 163 },
-    { CODEC_ID_VORBIS    , 221 }, /* non standard, gpac uses it */
-    { CODEC_ID_DVD_SUBTITLE, 224 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
-    { CODEC_ID_QCELP     , 225 },
+    { CODEC_ID_MPEG4     , 0x20 },
+    { CODEC_ID_H264      , 0x21 },
+    { CODEC_ID_AAC       , 0x40 },
+    { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
+    { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
+    { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
+    { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
+    { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
+    { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
+    { CODEC_ID_AAC       , 0x66 }, /* MPEG2 AAC Main */
+    { CODEC_ID_AAC       , 0x67 }, /* MPEG2 AAC Low */
+    { CODEC_ID_AAC       , 0x68 }, /* MPEG2 AAC SSR */
+    { CODEC_ID_MP3       , 0x69 }, /* 13818-3 */
+    { CODEC_ID_MP2       , 0x69 }, /* 11172-3 */
+    { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
+    { CODEC_ID_MP3       , 0x6B }, /* 11172-3 */
+    { CODEC_ID_MJPEG     , 0x6C }, /* 10918-1 */
+    { CODEC_ID_PNG       , 0x6D },
+    { CODEC_ID_JPEG2000  , 0x6E }, /* 15444-1 */
+    { CODEC_ID_VC1       , 0xA3 },
+    { CODEC_ID_DIRAC     , 0xA4 },
+    { CODEC_ID_AC3       , 0xA5 },
+    { CODEC_ID_VORBIS    , 0xDD }, /* non standard, gpac uses it */
+    { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
+    { CODEC_ID_QCELP     , 0xE1 },
     { 0, 0 },
 };
 
@@ -88,7 +90,7 @@ const AVCodecTag codec_movvideo_tags[] = {
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
     { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
-    { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV */
+    { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */
     { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */
@@ -154,6 +156,7 @@ const AVCodecTag codec_movvideo_tags[] = {
     { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
     { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
 
+    { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
     { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
     { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */
 
@@ -187,6 +190,7 @@ const AVCodecTag codec_movaudio_tags[] = {
 /*  { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
 
     { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */
+    { CODEC_ID_AC3, MKTAG('a', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */
 
     { CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
     { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
@@ -217,7 +221,7 @@ const AVCodecTag ff_codec_movsubtitle_tags[] = {
 /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
 /* http://developer.apple.com/documentation/mac/Text/Text-368.html */
 /* deprecated by putting the code as 3*5bit ascii */
-static const char *mov_mdhd_language_map[] = {
+static const char * const mov_mdhd_language_map[] = {
     /* 0-9 */
     "eng", "fra", "ger", "ita", "dut", "sve", "spa", "dan", "por", "nor",
     "heb", "jpn", "ara", "fin", "gre", "ice", "mlt", "tur", "hr "/*scr*/, "chi"/*ace?*/,
@@ -244,7 +248,7 @@ int ff_mov_iso639_to_lang(const char *lang, int mp4)
     int i, code = 0;
 
     /* old way, only for QT? */
-    for (i = 0; !mp4 && (i < (sizeof(mov_mdhd_language_map)/sizeof(char *))); i++) {
+    for (i = 0; !mp4 && i < FF_ARRAY_ELEMS(mov_mdhd_language_map); i++) {
         if (mov_mdhd_language_map[i] && !strcmp(lang, mov_mdhd_language_map[i]))
             return i;
     }
@@ -280,7 +284,7 @@ int ff_mov_lang_to_iso639(int code, char *to)
         return 1;
     }
     /* old fashion apple lang code */
-    if (code >= (sizeof(mov_mdhd_language_map)/sizeof(char *)))
+    if (code >= FF_ARRAY_ELEMS(mov_mdhd_language_map))
         return 0;
     if (!mov_mdhd_language_map[code])
         return 0;