Browse code

Simplify the logic for the subtitle stream selection.

Originally committed as revision 17692 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini authored on 2009/03/02 02:02:21
Showing 1 changed files
... ...
@@ -1982,8 +1982,7 @@ static int decode_thread(void *arg)
1982 1982
                 video_index = i;
1983 1983
             break;
1984 1984
         case CODEC_TYPE_SUBTITLE:
1985
-            if (wanted_subtitle_stream >= 0 && !video_disable &&
1986
-                    (subtitle_index < 0 || wanted_subtitle_stream-- >= 0))
1985
+            if (wanted_subtitle_stream-- >= 0 && !video_disable)
1987 1986
                 subtitle_index = i;
1988 1987
             break;
1989 1988
         default: