generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vcodec/jpeg2000: Increase cblk size limit to 128

Browse Source 
Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-24 17:38:05 +02:00
parent ffa1de8a3b
commit d580255571
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000.h
View 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

4
libavcodec/jpeg2000dec.c
View 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;
}