j2kdec: cdxy != 1 does not work, print an error
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 May 2013 12:50:04 +0000 (14:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 May 2013 13:13:18 +0000 (15:13 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c

index 41b109a..656ee38 100644 (file)
@@ -175,6 +175,9 @@ static int get_siz(Jpeg2000DecoderContext *s)
         s->sgnd[i] = !!(x & 0x80);
         s->cdx[i] = bytestream2_get_byteu(&s->g);
         s->cdy[i] = bytestream2_get_byteu(&s->g);
+        if (s->cdx[i] != 1 || s->cdy[i] != 1) {
+            av_log(s->avctx, AV_LOG_ERROR, "unsupported/ CDxy values\n");
+        }
     }
 
     s->numXtiles = ff_jpeg2000_ceildiv(s->width  - s->tile_offset_x, s->tile_width);