[FFmpeg-cvslog] vcodec/jpeg2000: Increase cblk size limit to 128

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 24 17:38:05 2015 +0200| [d5802555715549932637889acdf43f52b9334413] | committer: Michael Niedermayer

vcodec/jpeg2000: Increase cblk size limit to 128

Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5802555715549932637889acdf43f52b9334413
---

 libavcodec/jpeg2000.h    |    4 ++--
 libavcodec/jpeg2000dec.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index f963cbe..c1303f2 100644
--- a/libavcodec/jpeg2000.h
+++ b/libavcodec/jpeg2000.h
@@ -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
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 43568ea..fc5dc28 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -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;
     }