Simplify the logic for the subtitle stream selection.
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 1 Mar 2009 17:02:21 +0000 (17:02 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Sun, 1 Mar 2009 17:02:21 +0000 (17:02 +0000)
Originally committed as revision 17692 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffplay.c

index 6d9caf2..b4927c6 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1982,8 +1982,7 @@ static int decode_thread(void *arg)
                 video_index = i;
             break;
         case CODEC_TYPE_SUBTITLE:
-            if (wanted_subtitle_stream >= 0 && !video_disable &&
-                    (subtitle_index < 0 || wanted_subtitle_stream-- >= 0))
+            if (wanted_subtitle_stream-- >= 0 && !video_disable)
                 subtitle_index = i;
             break;
         default: