Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 35023:6077de703cf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sat, 25 Aug 2012 10:50:50 +0000
parents 4d94558867d6
children 60c7713b1061
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Sat Aug 25 05:27:38 2012 +0000
+++ b/libmpdemux/demux_lavf.c	Sat Aug 25 10:50:50 2012 +0000
@@ -812,7 +812,7 @@
                             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;
                 }