generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams

Browse Source 
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 <stream number> out.ts where stream number is a *_IMPAIRED stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Marton Balint
2014-02-04 23:59:47 +01:00
committed by Michael Niedermayer
parent 919791f99d
commit 6421111b52
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/utils.c
View File

@@ -3373,7 +3373,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
continue; continue;
if (wanted_stream_nb >= 0 && real_stream_index != wanted_stream_nb) if (wanted_stream_nb >= 0 && real_stream_index != wanted_stream_nb)
continue; 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)) AV_DISPOSITION_VISUAL_IMPAIRED))
continue; continue;
if (type == AVMEDIA_TYPE_AUDIO && !avctx->channels) if (type == AVMEDIA_TYPE_AUDIO && !avctx->channels)