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

[Clément Bœsch]

On Thu, May 01, 2014 at 12:56:23AM +0400, ValdikSS wrote:
> 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},

This was for compatibility, look below the #if/#endif. "SSA" packets were
still preferred, but maybe we can remove that ifdefery now.

(Note that I didn't look at the ticket yet)

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140430/8cc4c74a/attachment.asc>