summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-05-22 12:55:46 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2018-05-22 12:55:46 +0200
commit1083808c48cd58fe3b14dbfbbc3f46c2ae6c0352 (patch)
treea7b176be19ec0e45c803c5f2bf8654bbc2fbcd84 /libavcodec
parent848ce6f0a6075485720475ade0385a359f4700b5 (diff)
downloadffmpeg-streaming-1083808c48cd58fe3b14dbfbbc3f46c2ae6c0352.zip
ffmpeg-streaming-1083808c48cd58fe3b14dbfbbc3f46c2ae6c0352.tar.gz
lavc/jpeg2000dec: Move a variable declaration closer to its usage.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/jpeg2000dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 5fa9b9d..66f11bb 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -2053,7 +2053,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
} else if (atom2 == MKBETAG('p','c','l','r') && atom2_size >= 6) {
int i, size, colour_count, colour_channels, colour_depth[3];
- uint32_t r, g, b;
colour_count = bytestream2_get_be16u(&s->g);
colour_channels = bytestream2_get_byteu(&s->g);
// FIXME: Do not ignore channel_sign
@@ -2075,6 +2074,7 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
}
s->pal8 = 1;
for (i = 0; i < colour_count; i++) {
+ uint32_t r, g, b;
if (colour_depth[0] <= 8) {
r = bytestream2_get_byteu(&s->g) << 8 - colour_depth[0];
r |= r >> colour_depth[0];
OpenPOWER on IntegriCloud