virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Fix libopenjpeg colour range adjust for 8<bpp<16.

Browse Source 
Fixes ticket #3284.

Reviewed-by: Michael Bradshaw
This commit is contained in:
Carl Eugen Hoyos 2014-01-10 10:57:43 +01:00
parent 8b7cce441c
commit 8298b54179
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

@ -173,7 +173,7 @@ static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *i
int index, x, y, c; int index, x, y, c;
int adjust[4]; int adjust[4];
for (x = 0; x < image->numcomps; x++) for (x = 0; x < image->numcomps; x++)
adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0); adjust[x] = FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0);
for (y = 0; y < picture->height; y++) { for (y = 0; y < picture->height; y++) {
index = y*picture->width; index = y*picture->width;
@ -210,7 +210,7 @@ static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) {
int index, x, y; int index, x, y;
int adjust[4]; int adjust[4];
for (x = 0; x < image->numcomps; x++) for (x = 0; x < image->numcomps; x++)
adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0); adjust[x] = FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0);
for (index = 0; index < image->numcomps; index++) { for (index = 0; index < image->numcomps; index++) {
comp_data = image->comps[index].data; comp_data = image->comps[index].data;