[FFmpeg-cvslog] avcodec/jpeg2000dec: Fix shift for RGB(A)48/64

Michael Niedermayer git at videolan.org
Wed Jun 10 04:40:33 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 10 04:19:38 2015 +0200| [213f2da46adc8b240db3b90a0e96ff1405beb52a] | committer: Michael Niedermayer

avcodec/jpeg2000dec: Fix shift for RGB(A)48/64

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=213f2da46adc8b240db3b90a0e96ff1405beb52a
---

 libavcodec/jpeg2000dec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 24cb8a1..0d9eca3 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++) {



More information about the ffmpeg-cvslog mailing list