summaryrefslogtreecommitdiffstats
path: root/libavcodec/jpeg2000dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-24 17:38:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-24 17:38:05 +0200
commitd5802555715549932637889acdf43f52b9334413 (patch)
treefd79bf6824346b65c23f4281b4c3edc8d680ad84 /libavcodec/jpeg2000dec.c
parentffa1de8a3b93139097214bc600d356ab62bfdf05 (diff)
downloadffmpeg-streaming-d5802555715549932637889acdf43f52b9334413.zip
ffmpeg-streaming-d5802555715549932637889acdf43f52b9334413.tar.gz
vcodec/jpeg2000: Increase cblk size limit to 128
Fixes Ticket4649 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
-rw-r--r--libavcodec/jpeg2000dec.c4
1 files changed, 2 insertions, 2 deletions
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;
}
OpenPOWER on IntegriCloud