[FFmpeg-cvslog] adpcmenc: move 'ch' variable to higher scope

Justin Ruggles git at videolan.org
Sun Oct 7 11:43:27 CEST 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Aug 25 09:00:50 2012 -0400| [d9a13c2f5644915dcae538b8523014b7dbc5ff5a] | committer: Justin Ruggles

adpcmenc: move 'ch' variable to higher scope

It is used for multiple codecs.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9a13c2f5644915dcae538b8523014b7dbc5ff5a
---

 libavcodec/adpcmenc.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 4e365e5..157e475 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);
 



More information about the ffmpeg-cvslog mailing list