@@ -128,6 +128,7 @@ static int adx_encode_frame(AVCodecContext *avctx, uint8_t *frame,

     ADXContext *c          = avctx->priv_data;

     const int16_t *samples = data;

     uint8_t *dst           = frame;

+    int ch;

     if (!c->header_parsed) {

         int hdrsize = adx_encode_header(avctx, dst, buf_size);

@@ -135,13 +136,9 @@ static int adx_encode_frame(AVCodecContext *avctx, uint8_t *frame,

         c->header_parsed = 1;

     }

-    if (avctx->channels == 1) {

-            adx_encode(c, dst, samples, c->prev, avctx->channels);

-            dst     += 18;

-    } else {

-            adx_encode(c, dst,      samples,     c->prev,     avctx->channels);

-            adx_encode(c, dst + 18, samples + 1, c->prev + 1, avctx->channels);

-            dst     += 18*2;

+    for (ch = 0; ch < avctx->channels; ch++) {

+        adx_encode(c, dst, samples + ch, &c->prev[ch], avctx->channels);

+        dst += 18;

     }

     return dst - frame;

 }