From b450b82514e9eaf5bc59759e814bfc2b8e2d864d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 7 Jul 2016 14:41:05 +0200 Subject: [PATCH] avcodec/exr: Fix mixed declarations and statements Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index e226fd777d..6960a290f8 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1195,8 +1195,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata, } else { for (x = 0; x < td->xsize; x++) { union av_intfloat32 t; + int c; - for (int c = 0; c < rgb_channel_count; c++) { + for (c = 0; c < rgb_channel_count; c++) { t.i = bytestream_get_le32(&rgb[c]); if (t.f > 0.0f) /* avoid negative values */ t.f = powf(t.f, one_gamma); @@ -1210,7 +1211,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, } else { // 16-bit for (x = 0; x < td->xsize; x++) { - for (int c = 0; c < rgb_channel_count; c++) { + int c; + for (c = 0; c < rgb_channel_count; c++) { *ptr_x++ = s->gamma_table[bytestream_get_le16(&rgb[c])]; } -- 2.11.0