From 0916938a8dfac27096ed9f6873d32e24fa5f87c9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 9 Jun 2015 20:26:38 +0200 Subject: [PATCH] avcodec/jpeg2000dec: Fix gain regression with gray16 Found-by: carl Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index aecc6ebe02..24cb8a171f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1330,7 +1330,8 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, } } } else { - int precision = picture->format == AV_PIX_FMT_XYZ12 ? 16 : s->precision; + int precision = picture->format == AV_PIX_FMT_XYZ12 || + picture->format == AV_PIX_FMT_GRAY16 ? 16 : s->precision; for (compno = 0; compno < s->ncomponents; compno++) { Jpeg2000Component *comp = tile->comp + compno;