aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-28 12:18:35 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-05 18:29:12 +0100
commite90fbc86c1861d6448fa1371eb49adcefed239a1 (patch)
tree0d5eee036cc7fcc9c5747584128d3da6835b36fe /libavformat/utils.c
parent37ff66d1bde72f7fa89cd5c606d7288fb445852e (diff)
downloadffmpeg-e90fbc86c1861d6448fa1371eb49adcefed239a1.tar.gz
avformat/flvdec: Fix regression loosing streams
Fixes: unknown_video.flv Found-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 077939626eeaa0c1364065414c18ab9b3a072281) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 361744926b..a11f4adb31 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3294,6 +3294,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
int64_t max_subtitle_analyze_duration;
int64_t probesize = ic->probesize;
int eof_reached = 0;
+ int64_t *missing_streams = av_opt_ptr(ic->iformat->priv_class, ic->priv_data, "missing_streams");
flush_codecs = probesize > 0;
@@ -3447,6 +3448,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
break;
}
analyzed_all_streams = 0;
+ if (!missing_streams || !*missing_streams)
if (i == ic->nb_streams) {
analyzed_all_streams = 1;
/* NOTE: If the format has no header, then we need to read some