From 6421111b52de4442768e7ef31b4d29055f83900c Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Tue, 4 Feb 2014 23:59:47 +0100 Subject: [PATCH] lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams Previously these type of streams were not returned even if wanted stream was set to a stream of such. Now they are only skipped if they are not wanted streams. Fixes ffplay -sst out.ts where stream number is a *_IMPAIRED stream. Signed-off-by: Marton Balint Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2be4279b45..5cb7561a7b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3373,7 +3373,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, continue; if (wanted_stream_nb >= 0 && real_stream_index != wanted_stream_nb) continue; - if (st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | + if (wanted_stream_nb != real_stream_index && + st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | AV_DISPOSITION_VISUAL_IMPAIRED)) continue; if (type == AVMEDIA_TYPE_AUDIO && !avctx->channels)