videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-31 16:31:54 +02:00
Code Releases Activity

Fixed openjpeg decoding bug with width/linesize issue

Browse Source 
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>
This commit is contained in:
Michael Bradshaw 2011-12-03 12:14:03 -07:00 committed by Michael Niedermayer
parent 69d766daa0
commit d1669e5fe3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libopenjpegdec.c
View File

@ -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++;