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

[Clément Bœsch]

On Sat, Aug 25, 2012 at 10:16:03PM +0200, Philip Langdale wrote:
> ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sat Aug 11 20:29:20 2012 -0700| [2626cc4580bfd560c6983338d77b2c11c16af94f] | committer: Philip Langdale
> 
> matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.
> 
> 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.
> 
> Note that this change will impact tools that use libavformat. If
> they expect srt subtitles to have CODEC_ID_TEXT, they must be
> adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
> unchanged.
> 
> Signed-off-by: Philip Langdale <philipl at overt.org>
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2626cc4580bfd560c6983338d77b2c11c16af94f
> ---
> 
>  Changelog                 |    2 ++
>  libavformat/matroska.c    |    1 +
>  libavformat/matroskadec.c |    2 +-
>  3 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Changelog b/Changelog
> index 801cbff..e42f7c6 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -52,6 +52,8 @@ version next:
>  - ffmpeg -shortest option is now per-output file
>  - volume measurement filter
>  - Ut Video encoder
> +- Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP
> +  instead of AV_CODEC_ID_TEXT

I think this might belong to APIChanges instead

[...]

-- 
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-cvslog/attachments/20120825/ce8d2412/attachment.asc>