Commit 4a569576 authored by reimar's avatar reimar

Move variable into block where it is used, avoiding a unused variable

warning if the zlib decoder is disabled.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19038 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6a00ca37
...@@ -463,7 +463,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -463,7 +463,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
unsigned int basesize = avctx->width * avctx->height; unsigned int basesize = avctx->width * avctx->height;
unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3); unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3);
unsigned int max_decomp_size; unsigned int max_decomp_size;
int zret; // Zlib return code
c->pic.data[0] = NULL; c->pic.data[0] = NULL;
...@@ -595,6 +594,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -595,6 +594,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
/* If needed init zlib */ /* If needed init zlib */
#if CONFIG_ZLIB_DECODER #if CONFIG_ZLIB_DECODER
if (avctx->codec_id == CODEC_ID_ZLIB) { if (avctx->codec_id == CODEC_ID_ZLIB) {
int zret;
c->zstream.zalloc = Z_NULL; c->zstream.zalloc = Z_NULL;
c->zstream.zfree = Z_NULL; c->zstream.zfree = Z_NULL;
c->zstream.opaque = Z_NULL; c->zstream.opaque = Z_NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment