diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 01:06:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 01:22:16 +0200 |
| commit | a380f82c5335891a9d3ff939431366c48c0efc6d (patch) | |
| tree | c854553557c9d9263ede323f7bb69ac4d8e63b62 /libavformat | |
| parent | 740c99528880c1d101167f82eddcfe8ce5453605 (diff) | |
lavf: allow using request_probe as a score threshold to accept a codec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9c607d7307..0a79fe7eb7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -415,7 +415,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeDa int score; AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score); - if (fmt) { + if (fmt && st->request_probe <= score) { int i; av_log(s, AV_LOG_DEBUG, "Probe with size=%d, packets=%d detected %s with score=%d\n", pd->buf_size, MAX_PROBE_PACKETS - st->probe_packets, fmt->name, score); |