diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-11 00:03:37 +0100 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-11 00:03:37 +0100 |
commit | 26fc6ffec45c954cd8ca46342ac75cd90bcc7e02 (patch) | |
tree | 439e634e190ac845c47c6cd196e4d380612a5086 /libavcodec/libopenjpegdec.c | |
parent | a1ed1c2193483849df689b105bec0d26c2497999 (diff) | |
download | ffmpeg-26fc6ffec45c954cd8ca46342ac75cd90bcc7e02.tar.gz |
Cast signed libopenjpeg data values to unsigned before shifting.
This avoids undefined behaviour on left-shift.
Reviewed-by: Michael Bradshaw
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
-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 c0563e1589..7a4be52430 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -180,7 +180,7 @@ static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *i img_ptr = (uint16_t*) (picture->data[0] + y*picture->linesize[0]); for (x = 0; x < picture->width; x++, index++) { for (c = 0; c < image->numcomps; c++) { - *img_ptr++ = 0x8000 * image->comps[c].sgnd + (image->comps[c].data[index] << adjust[c]); + *img_ptr++ = 0x8000 * image->comps[c].sgnd + ((unsigned)image->comps[c].data[index] << adjust[c]); } } } @@ -217,7 +217,7 @@ static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) { 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 = 0x8000 * image->comps[index].sgnd + (*comp_data << adjust[index]); + *img_ptr = 0x8000 * image->comps[index].sgnd + ((unsigned)*comp_data << adjust[index]); img_ptr++; comp_data++; } |