lavc/mjpegdec: Skip unknown APPx marker on bayer images
authorNick Renieris <velocityra@gmail.com>
Thu, 29 Aug 2019 13:10:51 +0000 (16:10 +0300)
committerPaul B Mahol <onemda@gmail.com>
Mon, 2 Sep 2019 07:26:52 +0000 (09:26 +0200)
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>
libavcodec/mjpegdec.c

index 0a920a7..1f2fabe 100644 (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;