[libav-devel] [PATCH 06/11] adpcmenc: move 'ch' variable to higher scope

[Justin Ruggles]

It is used for multiple codecs.
---
 libavcodec/adpcmenc.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 5be7a1d..bd3b20f 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);
 
-- 
1.7.1

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