Module: libav Branch: master Commit: 9606f19b4eaf04d32a85d31e80899611466cfc9c
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Sat Aug 25 00:40:37 2012 -0400 adpcmenc: fix 3 instances of variable shadowing --- libavcodec/adpcmenc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 8be6e64..4e365e5 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); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
