diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-17 01:37:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-17 01:52:26 +0200 |
| commit | 487c346d98c0180eb8e4066c2c341a2a19f7f0af (patch) | |
| tree | b630291f57d99b5612689bb8b40dfe7aa7431b7a /libavcodec | |
| parent | 618032da0d05cfebb40bde46c1baceae1012fd27 (diff) | |
| download | ffmpeg-streaming-487c346d98c0180eb8e4066c2c341a2a19f7f0af.zip ffmpeg-streaming-487c346d98c0180eb8e4066c2c341a2a19f7f0af.tar.gz | |
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/exr.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |
