ffmpeg | branch: master | Carl Eugen Hoyos <ceffm...@gmail.com> | Sun Nov 12 04:29:06 2017 +0100| [b998a56b0ac9744537837c668e32487d060be3c0] | committer: Carl Eugen Hoyos
lavc/jpeg2000dec: Fix used variables reading palette. Affected files with palette and colour-depth < 8. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b998a56b0ac9744537837c668e32487d060be3c0 --- libavcodec/jpeg2000dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 9a5e64e854..62b9009a82 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2039,13 +2039,13 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) } if (colour_depth[1] <= 8) { g = bytestream2_get_byteu(&s->g) << 8 - colour_depth[1]; - r |= r >> colour_depth[1]; + g |= g >> colour_depth[1]; } else { g = bytestream2_get_be16u(&s->g) >> colour_depth[1] - 8; } if (colour_depth[2] <= 8) { b = bytestream2_get_byteu(&s->g) << 8 - colour_depth[2]; - r |= r >> colour_depth[2]; + b |= b >> colour_depth[2]; } else { b = bytestream2_get_be16u(&s->g) >> colour_depth[2] - 8; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
