Commit 737dccfc authored by Aurelien Jacobs's avatar Aurelien Jacobs

matroska: sort codec tags list

Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ea2a5dec
...@@ -22,26 +22,16 @@ ...@@ -22,26 +22,16 @@
#include "matroska.h" #include "matroska.h"
const CodecTags ff_mkv_codec_tags[]={ const CodecTags ff_mkv_codec_tags[]={
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO}, {"A_AAC" , CODEC_ID_AAC},
{"V_DIRAC" , CODEC_ID_DIRAC}, {"A_AC3" , CODEC_ID_AC3},
{"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4}, {"A_DTS" , CODEC_ID_DTS},
{"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4}, {"A_EAC3" , CODEC_ID_EAC3},
{"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4}, {"A_FLAC" , CODEC_ID_FLAC},
{"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_MPEG/L2" , CODEC_ID_MP2}, {"A_MPEG/L2" , CODEC_ID_MP2},
{"A_MPEG/L1" , 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_S16BE},
{"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE}, {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE},
{"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE}, {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE},
...@@ -49,22 +39,15 @@ const CodecTags ff_mkv_codec_tags[]={ ...@@ -49,22 +39,15 @@ const CodecTags ff_mkv_codec_tags[]={
{"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE}, {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE},
{"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE}, {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE},
{"A_PCM/INT/LIT" , CODEC_ID_PCM_U8}, {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8},
{"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
{"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_REAL/14_4" , CODEC_ID_RA_144}, {"A_REAL/14_4" , CODEC_ID_RA_144},
{"A_REAL/28_8" , CODEC_ID_RA_288}, {"A_REAL/28_8" , CODEC_ID_RA_288},
{"A_REAL/ATRC" , CODEC_ID_ATRAC3}, {"A_REAL/ATRC" , CODEC_ID_ATRAC3},
{"A_REAL/COOK" , CODEC_ID_COOK}, {"A_REAL/COOK" , CODEC_ID_COOK},
// {"A_REAL/SIPR" , CODEC_ID_SIPRO}, // {"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/UTF8" , CODEC_ID_TEXT},
{"S_TEXT/ASCII" , CODEC_ID_TEXT}, {"S_TEXT/ASCII" , CODEC_ID_TEXT},
...@@ -74,6 +57,23 @@ const CodecTags ff_mkv_codec_tags[]={ ...@@ -74,6 +57,23 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_SSA" , CODEC_ID_SSA}, {"S_SSA" , CODEC_ID_SSA},
{"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, {"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} {"" , CODEC_ID_NONE}
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment