[SCM] libav/experimental: Move variable into block where it is used, avoiding a unused variable warning if the zlib decoder is disabled.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:47:02 UTC 2013
The following commit has been merged in the experimental branch:
commit 46c02b1b50c69936f47cf746079ca6df6d363a92
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sun May 31 09:27:07 2009 +0000
Move variable into block where it is used, avoiding a unused variable
warning if the zlib decoder is disabled.
Originally committed as revision 19038 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 18cbd86..c955ff6 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -463,7 +463,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
unsigned int basesize = avctx->width * avctx->height;
unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3);
unsigned int max_decomp_size;
- int zret; // Zlib return code
c->pic.data[0] = NULL;
@@ -595,6 +594,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
/* If needed init zlib */
#if CONFIG_ZLIB_DECODER
if (avctx->codec_id == CODEC_ID_ZLIB) {
+ int zret;
c->zstream.zalloc = Z_NULL;
c->zstream.zfree = Z_NULL;
c->zstream.opaque = Z_NULL;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list