virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

adpcmenc: fix 3 instances of variable shadowing

Browse Source
This commit is contained in:
Justin Ruggles 2012-08-25 00:40:37 -04:00
parent 1e35574bad
commit 9606f19b4e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/adpcmenc.c
View File

@ -546,7 +546,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
case AV_CODEC_ID_ADPCM_IMA_QT: case AV_CODEC_ID_ADPCM_IMA_QT:
{ {
int ch, i; int ch;
PutBitContext pb; PutBitContext pb;
init_put_bits(&pb, dst, pkt_size * 8); 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: case AV_CODEC_ID_ADPCM_SWF:
{ {
int i;
PutBitContext pb; PutBitContext pb;
init_put_bits(&pb, dst, pkt_size * 8); 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); bytestream_put_le16(&dst, c->status[i].sample2);
if (avctx->trellis > 0) { 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); FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error);
if (avctx->channels == 1) { if (avctx->channels == 1) {
adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n); adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n);