simplify
Originally committed as revision 12995 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
0d5b2eb445
commit
8da8970d01
@ -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,
|
|||||||
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user