videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Skip Exif data when auto-detecting jpeg images.

This commit is contained in:
Carl Eugen Hoyos 2015-01-09 00:30:02 +01:00
parent 6d1a2efb8a
commit cd3405282c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/img2dec.c
View File

@ -643,14 +643,18 @@ static int j2k_probe(AVProbeData *p)
static int jpeg_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
int i, state = 0xD8;
int i, state = 0xD8, exif_size = 0;
if (AV_RB16(b) != 0xFFD8 ||
AV_RB32(b) == 0xFFD8FFF7)
return 0;
b += 2;
for (i = 0; i < p->buf_size - 2; i++) {
if (AV_RB16(b) == 0xFFE1 && AV_RB32(b + 4) == AV_RB32("Exif")) {
exif_size = AV_RB16(b + 2) + 2;
b += exif_size;
}
for (i = 0; i + exif_size < p->buf_size - 2; i++) {
int c;
if (b[i] != 0xFF)
continue;