Simplify the logic for the subtitle stream selection.

Originally committed as revision 17692 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2009-03-01 17:02:21 +00:00
parent 7f668bb3ea
commit 5ad4f0d473

View File

@ -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: