# HG changeset patch # User rbultje # Date 1269884223 0 # Node ID ee30fc612763b52d54339c0303c4de0921b69f51 # Parent 12416eb1ba884bcf2f6e6d4c614b4a0ddca0cda9 Simplify interleaving code. diff -r 12416eb1ba88 -r ee30fc612763 wmaprodec.c --- a/wmaprodec.c Mon Mar 29 12:53:35 2010 +0000 +++ b/wmaprodec.c Mon Mar 29 17:37:03 2010 +0000 @@ -1346,14 +1346,12 @@ /** 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; }