[FFmpeg-cvslog] avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
Michael Niedermayer
git at videolan.org
Sun Apr 17 02:04:48 CEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr 17 01:37:27 2016 +0200| [487c346d98c0180eb8e4066c2c341a2a19f7f0af] | committer: Michael Niedermayer
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=487c346d98c0180eb8e4066c2c341a2a19f7f0af
---
libavcodec/exr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index f54ffad..363562e 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list