generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf/img2dec: Improve detection of valid Quickdraw images.

Browse Source 
Detect Quickdraw images without application header with
lower score.
This commit is contained in:
Carl Eugen Hoyos
2015-06-29 16:25:11 +02:00
parent 5a458420e2
commit dee7943819
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/img2dec.c
View File

@@ -725,9 +725,15 @@ static int qdraw_probe(AVProbeData *p)
{ {
const uint8_t *b = p->buf; const uint8_t *b = p->buf;
if (!b[10] && AV_RB32(b+11) == 0x1102ff0c && !b[15] || if ( p->buf_size >= 528
p->buf_size >= 528 && !b[522] && AV_RB32(b+523) == 0x1102ff0c && !b[527]) && (AV_RB64(b + 520) & 0xFFFFFFFFFFFF) == 0x001102ff0c00
return AVPROBE_SCORE_EXTENSION + 1; && AV_RB16(b + 520)
&& AV_RB16(b + 518))
return AVPROBE_SCORE_MAX * 3 / 4;
if ( (AV_RB64(b + 8) & 0xFFFFFFFFFFFF) == 0x001102ff0c00
&& AV_RB16(b + 8)
&& AV_RB16(b + 6))
return AVPROBE_SCORE_EXTENSION / 4;
return 0; return 0;
} }