diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-25 00:40:37 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-10-06 12:25:33 -0400 |
| commit | 9606f19b4eaf04d32a85d31e80899611466cfc9c (patch) | |
| tree | 3a113698630be4ef5847a593008971326254abcf /libavcodec | |
| parent | 1e35574bad50595f6ace9a1b5b96c21ee62ee36a (diff) | |
| download | ffmpeg-9606f19b4eaf04d32a85d31e80899611466cfc9c.tar.gz | |
adpcmenc: fix 3 instances of variable shadowing
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/adpcmenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 8be6e64a80..4e365e5bd2 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); |