[FFmpeg-cvslog] lavf: allow using request_probe as a score threshold to accept a codec

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 23 01:06:07 2012 +0200| [a380f82c5335891a9d3ff939431366c48c0efc6d] | committer: Michael Niedermayer

lavf: allow using request_probe as a score threshold to accept a codec

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a380f82c5335891a9d3ff939431366c48c0efc6d
---

 libavformat/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9c607d7..0a79fe7 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);