[MPlayer-cvslog] r35117 - trunk/libmpdemux/demux_lavf.c

[reimar]

Author: reimar
Date: Sat Aug 25 12:50:50 2012
New Revision: 35117

Log:
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.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Sat Aug 25 07:27:38 2012	(r35116)
+++ trunk/libmpdemux/demux_lavf.c	Sat Aug 25 12:50:50 2012	(r35117)
@@ -812,7 +812,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;
                 }