Commit 8ff5d1f3 authored by Ronald S. Bultje's avatar Ronald S. Bultje

Simplify interleaving code.

Originally committed as revision 22719 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9cba6f5f
...@@ -1346,14 +1346,12 @@ static int decode_frame(WMAProDecodeCtx *s) ...@@ -1346,14 +1346,12 @@ static int decode_frame(WMAProDecodeCtx *s)
/** interleave samples and write them to the output buffer */ /** interleave samples and write them to the output buffer */
for (i = 0; i < s->num_channels; i++) { for (i = 0; i < s->num_channels; i++) {
float* ptr; float* ptr = s->samples + i;
int incr = s->num_channels; int incr = s->num_channels;
float* iptr = s->channel[i].out; 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 = av_clipf(*iptr++, -1.0, 32767.0 / 32768.0);
ptr += incr; ptr += incr;
} }
......
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