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

[Philip Langdale]

On Sun, 12 Aug 2012 11:13:21 +0200
Clément Bœsch <ubitux at gmail.com> wrote:

> > 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?

No, although you reminded me that I need to keep the
CODEC_ID_SRT entry here to allow for muxing of subtitles
coming out of srtenc.

I've added another patch to the series to add a subrip
encoder, and in a future change, I'll be able to rip out
CODEC_ID_SRT.

--phil