[FFmpeg-cvslog] avformat/img2dec: reduce bmppipe probe score

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 11 16:48:01 2014 +0200| [321c3cd1a97b9307760c3ebb175296590c382eca] | committer: Michael Niedermayer

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 at gmx.at>

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

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

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 8bbcddc..9f48c5d 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;
     }