[libav-devel] [PATCH 05/11] adpcmenc: fix 3 instances of variable shadowing

[Justin Ruggles]

---
 libavcodec/adpcmenc.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 3d488f4..5be7a1d 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -546,7 +546,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, 
AVPacket *avpkt,
     }
     case AV_CODEC_ID_ADPCM_IMA_QT:
     {
-        int ch, i;
+        int ch;
         PutBitContext pb;
         init_put_bits(&pb, dst, pkt_size * 8);
 
@@ -576,7 +576,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, 
AVPacket *avpkt,
     }
     case AV_CODEC_ID_ADPCM_SWF:
     {
-        int i;
         PutBitContext pb;
         init_put_bits(&pb, dst, pkt_size * 8);
 
@@ -641,7 +640,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, 
AVPacket *avpkt,
             bytestream_put_le16(&dst, c->status[i].sample2);
 
         if (avctx->trellis > 0) {
-            int n = avctx->block_align - 7 * avctx->channels;
+            n = avctx->block_align - 7 * avctx->channels;
             FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error);
             if (avctx->channels == 1) {
                 adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel