aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-06 04:20:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-25 15:06:53 +0200
commitd7071efae4a285dd3bd40d21aee00f13d044b339 (patch)
tree33ebdc25b82ad1527d5592ac6faf3dbc06154d08
parent81e4b6f11a01afe459b616511f7d18a8c1464b29 (diff)
downloadffmpeg-d7071efae4a285dd3bd40d21aee00f13d044b339.tar.gz
avformat/utils: avoid discarded streams in av_find_default_stream_index()
Fixes Ticket2010 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ff6841c6bb2d35f8d461419e45d59be7542d03fe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index ac68a132c5..0b20b0901f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1544,6 +1544,9 @@ int av_find_default_stream_index(AVFormatContext *s)
score += 50;
}
+ if (st->discard != AVDISCARD_ALL)
+ score += 200;
+
if (score > best_score) {
best_score = score;
best_stream = i;