summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-10 04:19:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 04:19:38 +0200
commit213f2da46adc8b240db3b90a0e96ff1405beb52a (patch)
tree61d84ed9a521bfba2c8aea4bc3a65df33379f53a
parent913685f55208efd78bfc34d82b261bd449e69774 (diff)
avcodec/jpeg2000dec: Fix shift for RGB(A)48/64
Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/jpeg2000dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 24cb8a171f..0d9eca3325 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1331,6 +1331,8 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
}
} else {
int precision = picture->format == AV_PIX_FMT_XYZ12 ||
+ picture->format == AV_PIX_FMT_RGB48 ||
+ picture->format == AV_PIX_FMT_RGBA64 ||
picture->format == AV_PIX_FMT_GRAY16 ? 16 : s->precision;
for (compno = 0; compno < s->ncomponents; compno++) {