summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-21 22:52:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-21 22:52:15 +0200
commitc0724413fda1152cf422c23f062ed4f4f4088c42 (patch)
tree0e86c4eac89a3eb899f052effdf3059d34858110
parent37b756bb70441a42b85aeb075a096fb02b560ab2 (diff)
downloadmpv-c0724413fda1152cf422c23f062ed4f4f4088c42.tar.bz2
mpv-c0724413fda1152cf422c23f062ed4f4f4088c42.tar.xz
demux_lavf: reject format probe matches with low score
When trying to determine the format of an input stream, demux_lavf retries the probe with a larger buffer size up to some limit if the match score is low, but when reaching the size limit it accepted the best match (if any) regardless of its score. Change it to require a score of at least AVPROBE_SCORE_MAX/4 to accept a match at all.
-rw-r--r--libmpdemux/demux_lavf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 96f83407b0..7f665a86bb 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -201,7 +201,7 @@ static int lavf_check_file(demuxer_t *demuxer){
read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
av_free(avpd.buf);
- if(!priv->avif){
+ if (!priv->avif || score <= AVPROBE_SCORE_MAX / 4) {
mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
return 0;
}else