From 0f40b54c1740e72d254a00d3b153ab5a2973f014 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 25 Jul 2007 15:58:12 +0000
Subject: [PATCH] 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
---
libavformat/matroska.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 801e8fedb62..d3fe3718ae6 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -40,9 +40,9 @@ CodecTags ff_mkv_codec_tags[]={
/* TODO: Real/Quicktime */
// {"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/L2" , CODEC_ID_MP3},
+ {"A_MPEG/L1" , CODEC_ID_MP3},
{"A_PCM/INT/BIG" , CODEC_ID_PCM_U16BE},
{"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE},
// {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE},
@@ -59,8 +59,8 @@ CodecTags ff_mkv_codec_tags[]={
{"A_REAL/COOK" , CODEC_ID_COOK},
// {"A_REAL/SIPR" , CODEC_ID_SIPRO},
- {"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/UTF8" , CODEC_ID_TEXT},
+ {"S_TEXT/ASCII" , CODEC_ID_TEXT},
{"S_TEXT/ASS" , CODEC_ID_TEXT},
{"S_TEXT/SSA" , CODEC_ID_TEXT},
{"S_ASS" , CODEC_ID_TEXT},
--
GitLab