Simplify interleaving code.

Originally committed as revision 22719 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2010-03-29 17:37:03 +00:00
parent 9cba6f5f40
commit 8ff5d1f319

View File

@ -1346,14 +1346,12 @@ static int decode_frame(WMAProDecodeCtx *s)
/** interleave samples and write them to the output buffer */
for (i = 0; i < s->num_channels; i++) {
float* ptr;
float* ptr = s->samples + i;
int incr = s->num_channels;
float* iptr = s->channel[i].out;
int x;
float* iend = iptr + s->samples_per_frame;
ptr = s->samples + i;
for (x = 0; x < s->samples_per_frame; x++) {
while (iptr < iend) {
*ptr = av_clipf(*iptr++, -1.0, 32767.0 / 32768.0);
ptr += incr;
}