Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-11-12 06:29:06 +0300
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-11-12 06:29:06 +0300
commitb998a56b0ac9744537837c668e32487d060be3c0 (patch)
tree1e9ac5feb272b915f1d538ea4bbb36833755308a /libavcodec/jpeg2000dec.c
parent5b5365fe9d635005a9020d89c2448f4b5828d42f (diff)
lavc/jpeg2000dec: Fix used variables reading palette.
Affected files with palette and colour-depth < 8.
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
-rw-r--r--libavcodec/jpeg2000dec.c4
1 files 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;
}