]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declaratio...
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 16 Apr 2016 23:37:27 +0000 (01:37 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 16 Apr 2016 23:52:26 +0000 (01:52 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/exr.c

index f54ffad1c757c22e85e73eaefb8090acfc2cba00..363562e6b99e7a79d7706a7b8256fc716fac58bf 100644 (file)
@@ -1484,6 +1484,8 @@ static int decode_header(EXRContext *s)
             continue;
         } else if ((var_size = check_header_variable(s, "tiles",
                                                      "tiledesc", 22)) >= 0) {
+            char tileLevel;
+
             if (!s->is_tile)
                 av_log(s->avctx, AV_LOG_WARNING,
                        "Found tile attribute and scanline flags. Exr will be interpreted as scanline.\n");
@@ -1491,7 +1493,7 @@ static int decode_header(EXRContext *s)
             s->tile_attr.xSize = bytestream2_get_le32(&s->gb);
             s->tile_attr.ySize = bytestream2_get_le32(&s->gb);
 
-            char tileLevel = bytestream2_get_byte(&s->gb);
+            tileLevel = bytestream2_get_byte(&s->gb);
             s->tile_attr.level_mode = tileLevel & 0x0f;
             s->tile_attr.level_round = (tileLevel >> 4) & 0x0f;