Browse Source

mjpeg: Do not fail jpeg decoding on bad EXIF data.

It is not required to correctly decode the image.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n2.3
Justin Ruggles Derek Buitenhuis 12 years ago
parent
commit
39ef000e19
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavcodec/mjpegdec.c

+ 2
- 4
libavcodec/mjpegdec.c View File

@@ -1665,9 +1665,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
ret = ff_tdecode_header(&gbytes, &le, &ifd_offset);
if (ret) {
av_log(s->avctx, AV_LOG_ERROR, "mjpeg: invalid TIFF header in EXIF data\n");
return ret;
}

} else {
bytestream2_seek(&gbytes, ifd_offset, SEEK_SET);

// read 0th IFD and store the metadata
@@ -1675,7 +1673,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
ret = avpriv_exif_decode_ifd(s->avctx, &gbytes, le, 0, &s->exif_metadata);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error decoding EXIF data\n");
return ret;
}
}

bytes_read = bytestream2_tell(&gbytes);


Loading…
Cancel
Save