diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-10 10:57:43 +0100 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-10 10:57:43 +0100 |
commit | 8298b54179c92fc3293ea312c4fcf153917bca0a (patch) | |
tree | 449c4cf1f6cca038406c33b085f807c231447661 /libavcodec | |
parent | 8b7cce441ce65b21213700b9baa32817ce4b9c27 (diff) | |
download | ffmpeg-streaming-8298b54179c92fc3293ea312c4fcf153917bca0a.zip ffmpeg-streaming-8298b54179c92fc3293ea312c4fcf153917bca0a.tar.gz |
Fix libopenjpeg colour range adjust for 8<bpp<16.
Fixes ticket #3284.
Reviewed-by: Michael Bradshaw
Diffstat (limited to 'libavcodec')
-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 0ed1436..c0563e1 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -173,7 +173,7 @@ static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *i int index, x, y, c; int adjust[4]; 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++) { index = y*picture->width; @@ -210,7 +210,7 @@ static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) { int index, x, y; int adjust[4]; 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++) { comp_data = image->comps[index].data; |