From 570c907609f4f33befd7f5e607b15a6ed45b02c2 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 25 Aug 2012 10:50:50 +0000 Subject: demux_lavf: do not special case ID_TEXT subs on program switching When switching programs select subtitle stream regardless of whether the format is text, ASS, bitmap or whatever. There probably was some good reason for the condition but it got lost in time and special-casing CODEC_ID_TEXT over other test-based subtitles doesn't seem to make much sense. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35117 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c --- libmpdemux/demux_lavf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 237d16a5c5..630850f00d 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -1007,7 +1007,7 @@ redo: prog->aid = program->stream_index[i]; break; case AVMEDIA_TYPE_SUBTITLE: - if (prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT) + if (prog->sid == -2) prog->sid = program->stream_index[i]; break; } -- cgit v1.2.3