]> git.sesse.net Git - ffmpeg/blobdiff - libavformat/matroska.c
'code' is used to index a table so make it unsigned
[ffmpeg] / libavformat / matroska.c
index 8862d7c5859c2607e6668fe6a9bce08c38bdc60f..f967f3e909369bd7f0911aefc26e25cd3a6e96ac 100644 (file)
 #include "matroska.h"
 
 const CodecTags ff_mkv_codec_tags[]={
-    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
-    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
-    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
-    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
-    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
-    {"V_MJPEG"          , CODEC_ID_MJPEG},
-    {"V_REAL/RV10"      , CODEC_ID_RV10},
-    {"V_REAL/RV20"      , CODEC_ID_RV20},
-    {"V_REAL/RV30"      , CODEC_ID_RV30},
-    {"V_REAL/RV40"      , CODEC_ID_RV40},
-    {"V_THEORA"         , CODEC_ID_THEORA},
-    {"V_SNOW"           , CODEC_ID_SNOW},
-
-    {"A_MPEG/L3"        , CODEC_ID_MP3},
+    {"A_AAC"            , CODEC_ID_AAC},
+    {"A_AC3"            , CODEC_ID_AC3},
+    {"A_DTS"            , CODEC_ID_DTS},
+    {"A_EAC3"           , CODEC_ID_EAC3},
+    {"A_FLAC"           , CODEC_ID_FLAC},
     {"A_MPEG/L2"        , CODEC_ID_MP2},
     {"A_MPEG/L1"        , CODEC_ID_MP2},
+    {"A_MPEG/L3"        , CODEC_ID_MP3},
+    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
+    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
     {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
     {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
     {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
@@ -48,22 +39,15 @@ const CodecTags ff_mkv_codec_tags[]={
     {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
     {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
     {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
-    {"A_AC3"            , CODEC_ID_AC3},
-//    {"A_EAC3"           , CODEC_ID_EAC3},
-    {"A_DTS"            , CODEC_ID_DTS},
-    {"A_VORBIS"         , CODEC_ID_VORBIS},
-    {"A_AAC"            , CODEC_ID_AAC},
-    {"A_FLAC"           , CODEC_ID_FLAC},
-    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
-    {"A_TTA1"           , CODEC_ID_TTA},
+    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
     {"A_REAL/14_4"      , CODEC_ID_RA_144},
     {"A_REAL/28_8"      , CODEC_ID_RA_288},
     {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
     {"A_REAL/COOK"      , CODEC_ID_COOK},
 //    {"A_REAL/SIPR"      , CODEC_ID_SIPRO},
-    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
+    {"A_TTA1"           , CODEC_ID_TTA},
+    {"A_VORBIS"         , CODEC_ID_VORBIS},
+    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
 
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
     {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
@@ -73,6 +57,23 @@ const CodecTags ff_mkv_codec_tags[]={
     {"S_SSA"            , CODEC_ID_SSA},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
+    {"V_DIRAC"          , CODEC_ID_DIRAC},
+    {"V_MJPEG"          , CODEC_ID_MJPEG},
+    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
+    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
+    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
+    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
+    {"V_REAL/RV10"      , CODEC_ID_RV10},
+    {"V_REAL/RV20"      , CODEC_ID_RV20},
+    {"V_REAL/RV30"      , CODEC_ID_RV30},
+    {"V_REAL/RV40"      , CODEC_ID_RV40},
+    {"V_SNOW"           , CODEC_ID_SNOW},
+    {"V_THEORA"         , CODEC_ID_THEORA},
+    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
+
     {""                 , CODEC_ID_NONE}
 };