Commit 8da8970d authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

simplify

Originally committed as revision 12995 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0d5b2eb4
...@@ -2573,7 +2573,6 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, ...@@ -2573,7 +2573,6 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
OUT_INT *outptr, *bp; OUT_INT *outptr, *bp;
int fsize; int fsize;
int fr, i, j, n; int fr, i, j, n;
int off = avctx->channels;
len = buf_size; len = buf_size;
...@@ -2610,13 +2609,13 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, ...@@ -2610,13 +2609,13 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
if(m->nb_channels == 1) { if(m->nb_channels == 1) {
for(j = 0; j < n; j++) { for(j = 0; j < n; j++) {
*bp = decoded_buf[j]; *bp = decoded_buf[j];
bp += off; bp += avctx->channels;
} }
} else { } else {
for(j = 0; j < n; j++) { for(j = 0; j < n; j++) {
bp[0] = decoded_buf[j++]; bp[0] = decoded_buf[j++];
bp[1] = decoded_buf[j]; bp[1] = decoded_buf[j];
bp += off; bp += avctx->channels;
} }
} }
} }
......
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