openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 11:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavc/mjpegdec: Skip unknown APPx marker on bayer images

Browse Source 
Samples:
- Embedded JPEG images in the DNG images here:
  https://www.photographyblog.com/previews/pentax_k1_photos

Signed-off-by: Nick Renieris <velocityra@gmail.com>
This commit is contained in:
Nick Renieris 2019-08-29 16:10:51 +03:00 committed by Paul B Mahol
parent c44aa7f176
commit fcf0ebc4a9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mjpegdec.c
View File

@ -1807,8 +1807,15 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
int len, id, i;
len = get_bits(&s->gb, 16);
if (len < 6)
return AVERROR_INVALIDDATA;
if (len < 6) {
if (s->bayer) {
// Pentax K-1 (digital camera) JPEG images embedded in DNG images contain unknown APP0 markers
av_log(s->avctx, AV_LOG_WARNING, "skipping APPx (len=%"PRId32") for bayer-encoded image\n", len);
skip_bits(&s->gb, len);
return 0;
} else
return AVERROR_INVALIDDATA;
}
if (8 * len > get_bits_left(&s->gb))
return AVERROR_INVALIDDATA;