avformat/img2dec: improve bmp probe

fix probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/76/merge
Michael Niedermayer 11 years ago
parent d36fe733c1
commit c277ab6b78
  1. 19
      libavformat/img2dec.c

@ -564,13 +564,20 @@ AVInputFormat ff_image2pipe_demuxer = {
static int bmp_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
int ihsize;
if (AV_RB16(b) == 0x424d)
if (!AV_RN32(b + 6)) {
return AVPROBE_SCORE_EXTENSION + 1;
} else {
return AVPROBE_SCORE_EXTENSION / 4;
}
if (AV_RB16(b) != 0x424d)
return 0;
ihsize = AV_RL32(b+14);
if (ihsize < 12 || ihsize > 255)
return 0;
if (!AV_RN32(b + 6)) {
return AVPROBE_SCORE_EXTENSION + 1;
} else {
return AVPROBE_SCORE_EXTENSION / 4;
}
return 0;
}

Loading…
Cancel
Save