From d9a13c2f5644915dcae538b8523014b7dbc5ff5a Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 25 Aug 2012 09:00:50 -0400 Subject: adpcmenc: move 'ch' variable to higher scope It is used for multiple codecs. --- libavcodec/adpcmenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavcodec/adpcmenc.c') diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 4e365e5bd2..157e475705 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -478,7 +478,7 @@ static void adpcm_compress_trellis(AVCodecContext *avctx, static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { - int n, i, st, pkt_size, ret; + int n, i, ch, st, pkt_size, ret; const int16_t *samples; uint8_t *dst; ADPCMEncodeContext *c = avctx->priv_data; @@ -500,7 +500,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, switch(avctx->codec->id) { case AV_CODEC_ID_ADPCM_IMA_WAV: { - int blocks, j, ch; + int blocks, j; blocks = (frame->nb_samples - 1) / 8; @@ -546,7 +546,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } case AV_CODEC_ID_ADPCM_IMA_QT: { - int ch; PutBitContext pb; init_put_bits(&pb, dst, pkt_size * 8); -- cgit v1.2.3