diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-27 01:12:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-27 01:53:18 +0200 |
| commit | c75273310cf1becffee79bab0e2bba0b1606afb7 (patch) | |
| tree | 240a4379d0458dde06ebc9cf89a7f0b220c956ca | |
| parent | 0429ff4be674b1a50c6301f1f7a23a4879cb0dcd (diff) | |
| download | ffmpeg-c75273310cf1becffee79bab0e2bba0b1606afb7.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>
| -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 d7f3c7a0b2..ba08792c3f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -307,7 +307,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", @@ -318,6 +318,9 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, if (fmt_id_type[i].type != AVMEDIA_TYPE_AUDIO && st->codecpar->sample_rate) continue; + if (st->request_probe > score && + st->codecpar->codec_id != fmt_id_type[i].id) + continue; st->codecpar->codec_id = fmt_id_type[i].id; st->codecpar->codec_type = fmt_id_type[i].type; st->internal->need_context_update = 1; |