[FFmpeg-devel] [PATCH] lavf/matroska: Handle ASS as ASS instead of SSA

ValdikSS iam at valdikss.org.ru
Wed Apr 30 22:56:23 CEST 2014


After introducing ASS codec id and renaming (old) ASS to SSA,
Matroska ASS codec tag was mistakenly renamed too, making ASS
subtitles handled as SSA.

This fixes Ticket #3491
---
  libavformat/matroska.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index e8e9996..7dc09b3 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -67,9 +67,9 @@ const CodecTags ff_mkv_codec_tags[]={
      {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
      {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
  #if FF_API_ASS_SSA
-    {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},
+    {"S_TEXT/ASS"       , AV_CODEC_ID_ASS},
      {"S_TEXT/SSA"       , AV_CODEC_ID_SSA},
-    {"S_ASS"            , AV_CODEC_ID_SSA},
+    {"S_ASS"            , AV_CODEC_ID_ASS},
      {"S_SSA"            , AV_CODEC_ID_SSA},
  #endif
      {"S_TEXT/ASS"       , AV_CODEC_ID_ASS},
-- 
1.9.2



More information about the ffmpeg-devel mailing list