Commit d9a13c2f authored by Justin Ruggles's avatar Justin Ruggles

adpcmenc: move 'ch' variable to higher scope

It is used for multiple codecs.
parent 9606f19b
...@@ -478,7 +478,7 @@ static void adpcm_compress_trellis(AVCodecContext *avctx, ...@@ -478,7 +478,7 @@ static void adpcm_compress_trellis(AVCodecContext *avctx,
static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr) 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; const int16_t *samples;
uint8_t *dst; uint8_t *dst;
ADPCMEncodeContext *c = avctx->priv_data; ADPCMEncodeContext *c = avctx->priv_data;
...@@ -500,7 +500,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -500,7 +500,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
switch(avctx->codec->id) { switch(avctx->codec->id) {
case AV_CODEC_ID_ADPCM_IMA_WAV: case AV_CODEC_ID_ADPCM_IMA_WAV:
{ {
int blocks, j, ch; int blocks, j;
blocks = (frame->nb_samples - 1) / 8; blocks = (frame->nb_samples - 1) / 8;
...@@ -546,7 +546,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -546,7 +546,6 @@ 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;
PutBitContext pb; PutBitContext pb;
init_put_bits(&pb, dst, pkt_size * 8); init_put_bits(&pb, dst, pkt_size * 8);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment