diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-27 01:12:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-05 01:01:35 +0200 |
| commit | 1b47c278a606f1bef198b6a7746edc70e0e7d84d (patch) | |
| tree | 9db2365dc88e69f2b4e55afe04d10079df2d1fe3 /libavformat | |
| parent | cd91aaa4cc59bca6d05e30a0b044cd95df26a26f (diff) | |
| download | ffmpeg-1b47c278a606f1bef198b6a7746edc70e0e7d84d.tar.gz | |
avformat/utils: End probing if the expected codec surpasses AVPROBE_SCORE_STREAM_RETRY
Fixes Ticket5800
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c75273310cf1becffee79bab0e2bba0b1606afb7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 542ded76cb..fbc9a68bbe 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -297,7 +297,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, int score; AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score); - if (fmt && st->request_probe <= score) { + if (fmt) { int i; av_log(s, AV_LOG_DEBUG, "Probe with size=%d, packets=%d detected %s with score=%d\n", @@ -305,6 +305,9 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, fmt->name, score); for (i = 0; fmt_id_type[i].name; i++) { if (!strcmp(fmt->name, fmt_id_type[i].name)) { + if (st->request_probe > score && + st->codec->codec_id != fmt_id_type[i].id) + continue; st->codec->codec_id = fmt_id_type[i].id; st->codec->codec_type = fmt_id_type[i].type; return score; |