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

[Clément Bœsch]

On Sat, Aug 11, 2012 at 08:41:26PM -0700, Philip Langdale 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 withotu Subrip in-band timing.

without*

> 
> 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 |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/libavformat/matroska.c b/libavformat/matroska.c
> index b386d74..b9933d3 100644
> --- a/libavformat/matroska.c
> +++ b/libavformat/matroska.c
> @@ -53,8 +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_SRT},
> +    {"S_TEXT/UTF8"      , AV_CODEC_ID_SUBRIP},
>      {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
>      {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},
>      {"S_TEXT/SSA"       , AV_CODEC_ID_SSA},

OK.

No changes needed on the muxer side?

-- 
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/20120812/5d59804c/attachment.asc>