vcodec/jpeg2000: Increase cblk size limit to 128
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 15:38:05 +0000 (17:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 15:38:05 +0000 (17:38 +0200)
Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c

index f963cbe..c1303f2 100644 (file)
@@ -67,8 +67,8 @@ enum Jpeg2000Quantsty { // quantization style
     JPEG2000_QSTY_SE    // scalar expounded
 };
 
-#define JPEG2000_MAX_CBLKW 64
-#define JPEG2000_MAX_CBLKH 64
+#define JPEG2000_MAX_CBLKW 128
+#define JPEG2000_MAX_CBLKH 128
 
 
 #define JPEG2000_MAX_DECLEVELS 32
index 43568ea..fc5dc28 100644 (file)
@@ -439,8 +439,8 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
         return AVERROR_INVALIDDATA;
     }
 
-    if (c->log2_cblk_width > 6 || c->log2_cblk_height > 6) {
-        avpriv_request_sample(s->avctx, "cblk size > 64");
+    if (c->log2_cblk_width > 7 || c->log2_cblk_height > 7) {
+        avpriv_request_sample(s->avctx, "cblk size > 128");
         return AVERROR_PATCHWELCOME;
     }