diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 22:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 22:11:05 +0100 |
| commit | 0eb7de19736891a9386ab66549f780e904a3b6a7 (patch) | |
| tree | 7005b8d9ba682290248544bc9ca590ec25ea6210 /libavcodec/jpeg2000dwt.h | |
| parent | 65d3359fb366ea265a8468d76a111cb7352f0b55 (diff) | |
| download | ffmpeg-0eb7de19736891a9386ab66549f780e904a3b6a7.tar.gz | |
avcodec/jpeg2000: Change coord to 32bit to support larger than 32k width or height
Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000dwt.h')
| -rw-r--r-- | libavcodec/jpeg2000dwt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dwt.h b/libavcodec/jpeg2000dwt.h index 57297d4127..718d183ac1 100644 --- a/libavcodec/jpeg2000dwt.h +++ b/libavcodec/jpeg2000dwt.h @@ -42,7 +42,7 @@ enum DWTType { typedef struct DWTContext { /// line lengths { horizontal, vertical } in consecutive decomposition levels - uint16_t linelen[FF_DWT_MAX_DECLVLS][2]; + int linelen[FF_DWT_MAX_DECLVLS][2]; uint8_t mod[FF_DWT_MAX_DECLVLS][2]; ///< coordinates (x0, y0) of decomp. levels mod 2 uint8_t ndeclevels; ///< number of decomposition levels uint8_t type; ///< 0 for 9/7; 1 for 5/3 @@ -57,7 +57,7 @@ typedef struct DWTContext { * @param decomp_levels number of decomposition levels * @param type 0 for DWT 9/7; 1 for DWT 5/3 */ -int ff_jpeg2000_dwt_init(DWTContext *s, uint16_t border[2][2], +int ff_jpeg2000_dwt_init(DWTContext *s, int border[2][2], int decomp_levels, int type); int ff_dwt_encode(DWTContext *s, void *t); |