aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-11 16:48:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-12 18:19:11 +0200
commit321c3cd1a97b9307760c3ebb175296590c382eca (patch)
treeb03772586bd7ff12e5c6d9480e4cfff5b78dfcb4
parente3fb2b0eb7c5e420fc23e015c95b9c3e42abb2bf (diff)
downloadffmpeg-321c3cd1a97b9307760c3ebb175296590c382eca.tar.gz
avformat/img2dec: reduce bmppipe probe score
bmp pipe needs the bmp parser which is not bug free and should thus not be favored over the bmp image2 demuxer that also means this change could be reverted in case bmp pipe is improved so it handles all single bmp images correctly Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/img2dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 8bbcddcc9d..9f48c5d2a1 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -574,7 +574,7 @@ static int bmp_probe(AVProbeData *p)
return 0;
if (!AV_RN32(b + 6)) {
- return AVPROBE_SCORE_EXTENSION + 1;
+ return AVPROBE_SCORE_EXTENSION - 1; // lower than extension as bmp pipe has bugs
} else {
return AVPROBE_SCORE_EXTENSION / 4;
}