From 9b8967a7decf1bd01e0543981fe44651b03101fb Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 25 Aug 2012 10:52:00 +0000 Subject: demux_lavf: support SRT subtitles Support subrip format subtitles. Patch by Philip Langdale [philipl overt org]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35118 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c --- libmpdemux/demux_lavf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 630850f00d..b1312a632f 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -489,8 +489,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) case AVMEDIA_TYPE_SUBTITLE: { sh_sub_t *sh_sub; char type; - /* only support text subtitles for now */ - if (codec->codec_id == CODEC_ID_TEXT) + if (codec->codec_id == CODEC_ID_TEXT || + codec->codec_id == AV_CODEC_ID_SUBRIP) type = 't'; else if (codec->codec_id == CODEC_ID_MOV_TEXT) type = 'm'; -- cgit v1.2.3