virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/img2dec: improve bmp probe

Browse Source 
fix probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-04 04:54:52 +02:00
parent d36fe733c1
commit c277ab6b78
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/img2dec.c
View File

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