Commit 1083808c authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/jpeg2000dec: Move a variable declaration closer to its usage.

parent 848ce6f0
...@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) ...@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
} }
} else if (atom2 == MKBETAG('p','c','l','r') && atom2_size >= 6) { } else if (atom2 == MKBETAG('p','c','l','r') && atom2_size >= 6) {
int i, size, colour_count, colour_channels, colour_depth[3]; int i, size, colour_count, colour_channels, colour_depth[3];
uint32_t r, g, b;
colour_count = bytestream2_get_be16u(&s->g); colour_count = bytestream2_get_be16u(&s->g);
colour_channels = bytestream2_get_byteu(&s->g); colour_channels = bytestream2_get_byteu(&s->g);
// FIXME: Do not ignore channel_sign // FIXME: Do not ignore channel_sign
...@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) ...@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
} }
s->pal8 = 1; s->pal8 = 1;
for (i = 0; i < colour_count; i++) { for (i = 0; i < colour_count; i++) {
uint32_t r, g, b;
if (colour_depth[0] <= 8) { if (colour_depth[0] <= 8) {
r = bytestream2_get_byteu(&s->g) << 8 - colour_depth[0]; r = bytestream2_get_byteu(&s->g) << 8 - colour_depth[0];
r |= r >> colour_depth[0]; r |= r >> colour_depth[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment