[FFmpeg-devel] [PATCH 2/4] matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.

[Philip Langdale]

On Sun, 12 Aug 2012 14:26:27 -0700
Philip Langdale <philipl at overt.org> wrote:

> While not explicitly stated in the specs, the original author
> has stated that S_TEXT/UTF-8 is expected to be text using Subrip
> markup, but without Subrip in-band timing.
> 
> So, now that we have a decoder that conforms to this expectation,
> let's use it.
> 
> Signed-off-by: Philip Langdale <philipl at overt.org>
> ---
>  libavformat/matroska.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/matroska.c b/libavformat/matroska.c
> index b386d74..5350af3 100644
> --- a/libavformat/matroska.c
> +++ b/libavformat/matroska.c
> @@ -53,7 +53,7 @@ const CodecTags ff_mkv_codec_tags[]={
>      {"A_VORBIS"         , AV_CODEC_ID_VORBIS},
>      {"A_WAVPACK4"       , AV_CODEC_ID_WAVPACK},
>  
> -    {"S_TEXT/UTF8"      , AV_CODEC_ID_TEXT},
> +    {"S_TEXT/UTF8"      , AV_CODEC_ID_SUBRIP},
>      {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
>      {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
>      {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},

I have just pushed the other patches in this set, but I was thinking
more on the implications of this one, and it has the effect of
breaking backward compatibility, in the sense that any existing
ffmpeg user will presumably expect CODEC_ID_TEXT to come out of
matroska files, and will have no idea what to do with CODEC_ID_SUBRIP.

What's the correct way to indicate this? Is it a major version bump?

--phil

PS: I will make the appropriate mplayer change, of course.