]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
simplify
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 26 Apr 2008 14:30:06 +0000 (14:30 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 26 Apr 2008 14:30:06 +0000 (14:30 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12995 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mpegaudiodec.c

index 7d584b5e2b82274bb1cdaed6f4616c6bb3e1c48c..24792ae16f91798761c9a2105843ed4bc383e787 100644 (file)
@@ -2573,7 +2573,6 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
     OUT_INT *outptr, *bp;
     int fsize;
     int fr, i, j, n;
-    int off = avctx->channels;
 
     len = buf_size;
 
@@ -2610,13 +2609,13 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
             if(m->nb_channels == 1) {
                 for(j = 0; j < n; j++) {
                     *bp = decoded_buf[j];
-                    bp += off;
+                    bp += avctx->channels;
                 }
             } else {
                 for(j = 0; j < n; j++) {
                     bp[0] = decoded_buf[j++];
                     bp[1] = decoded_buf[j];
-                    bp += off;
+                    bp += avctx->channels;
                 }
             }
         }