diff options
| author | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2011-12-03 12:14:03 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 22:52:21 +0100 |
| commit | a598f0a5d7fdfc545f15b5cd4ae45421817474ca (patch) | |
| tree | 2be2c963922c1fc01ed88343c1a50fe84d7c0bb9 | |
| parent | 80695c9d1f0dcfc96f7c2d4a469d0ecc5939fb2f (diff) | |
| download | ffmpeg-a598f0a5d7fdfc545f15b5cd4ae45421817474ca.tar.gz | |
Fixed openjpeg decoding bug with width/linesize issue
The original code wasn't taking into account the fact that linesize may not equal the frame's width. This is to correct that.
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1669e5fe3d61dc4181f96138eb4355aaaf231ea)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 6344ad0c74..8cab41e124 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -139,8 +139,8 @@ static inline void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) { for(index = 0; index < image->numcomps; index++) { comp_data = image->comps[index].data; - img_ptr = picture->data[index]; for(y = 0; y < image->comps[index].h; y++) { + img_ptr = picture->data[index] + y * picture->linesize[index]; for(x = 0; x < image->comps[index].w; x++) { *img_ptr = (uint8_t) *comp_data; img_ptr++; @@ -156,8 +156,8 @@ static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) { int index, x, y; for(index = 0; index < image->numcomps; index++) { comp_data = image->comps[index].data; - img_ptr = (uint16_t*) picture->data[index]; for(y = 0; y < image->comps[index].h; y++) { + img_ptr = (uint16_t*) (picture->data[index] + y * picture->linesize[index]); for(x = 0; x < image->comps[index].w; x++) { *img_ptr = *comp_data; img_ptr++; |