RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reorder matroska codec tags so that the encoder picks up the appropriate tag 

Originally committed as revision 9793 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-07-25 15:58:12 +00:00
parent 5d2b15b870
commit 0f40b54c17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroska.c
View File

@ -40,9 +40,9 @@ CodecTags ff_mkv_codec_tags[]={
/* TODO: Real/Quicktime */ /* TODO: Real/Quicktime */
// {"A_MS/ACM" , CODEC_ID_NONE}, // {"A_MS/ACM" , CODEC_ID_NONE},
{"A_MPEG/L1" , CODEC_ID_MP3},
{"A_MPEG/L2" , CODEC_ID_MP3},
{"A_MPEG/L3" , CODEC_ID_MP3}, {"A_MPEG/L3" , CODEC_ID_MP3},
{"A_MPEG/L2" , CODEC_ID_MP3},
{"A_MPEG/L1" , CODEC_ID_MP3},
{"A_PCM/INT/BIG" , CODEC_ID_PCM_U16BE}, {"A_PCM/INT/BIG" , CODEC_ID_PCM_U16BE},
{"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE}, {"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE},
// {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE}, // {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
@ -59,8 +59,8 @@ CodecTags ff_mkv_codec_tags[]={
{"A_REAL/COOK" , CODEC_ID_COOK}, {"A_REAL/COOK" , CODEC_ID_COOK},
// {"A_REAL/SIPR" , CODEC_ID_SIPRO}, // {"A_REAL/SIPR" , CODEC_ID_SIPRO},
{"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/UTF8" , CODEC_ID_TEXT}, {"S_TEXT/UTF8" , CODEC_ID_TEXT},
{"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/ASS" , CODEC_ID_TEXT}, {"S_TEXT/ASS" , CODEC_ID_TEXT},
{"S_TEXT/SSA" , CODEC_ID_TEXT}, {"S_TEXT/SSA" , CODEC_ID_TEXT},
{"S_ASS" , CODEC_ID_TEXT}, {"S_ASS" , CODEC_ID_TEXT},