[SCM] libav/experimental: And on the sixth day, God gave us the <= operand, which makes the loop "for (i = 1; i < num + 1; i++)" look like "for (i = 1; i <= num; i++)". Programmers worldwide rejoiced and used the operand, e.g. in the thread "[PATCH] remove ugliness in cel_filters.c", and He saw that it was good.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b1ade3d1821a29174963b28cd0caa5f7ed394998
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Mon Nov 9 22:04:03 2009 +0000

    And on the sixth day, God gave us the <= operand, which makes the loop
    "for (i = 1; i < num + 1; i++)" look like "for (i = 1; i <= num; i++)".
    Programmers worldwide rejoiced and used the operand, e.g. in the thread
    "[PATCH] remove ugliness in cel_filters.c", and He saw that it was good.
    
    Originally committed as revision 20489 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c
index d54e2fa..d886085 100644
--- a/libavcodec/celp_filters.c
+++ b/libavcodec/celp_filters.c
@@ -67,12 +67,9 @@ int ff_celp_lp_synthesis_filter(int16_t *out,
 {
     int i,n;
 
-    // Avoids a +1 in the inner loop.
-    filter_length++;
-
     for (n = 0; n < buffer_length; n++) {
         int sum = rounder;
-        for (i = 1; i < filter_length; i++)
+        for (i = 1; i <= filter_length; i++)
             sum -= filter_coeffs[i-1] * out[n-i];
 
         sum = (sum >> 12) + in[n];
@@ -96,12 +93,9 @@ void ff_celp_lp_synthesis_filterf(float *out,
 {
     int i,n;
 
-    // Avoids a +1 in the inner loop.
-    filter_length++;
-
     for (n = 0; n < buffer_length; n++) {
         out[n] = in[n];
-        for (i = 1; i < filter_length; i++)
+        for (i = 1; i <= filter_length; i++)
             out[n] -= filter_coeffs[i-1] * out[n-i];
     }
 }
@@ -114,12 +108,9 @@ void ff_celp_lp_zero_synthesis_filterf(float *out,
 {
     int i,n;
 
-    // Avoids a +1 in the inner loop.
-    filter_length++;
-
     for (n = 0; n < buffer_length; n++) {
         out[n] = in[n];
-        for (i = 1; i < filter_length; i++)
+        for (i = 1; i <= filter_length; i++)
             out[n] += filter_coeffs[i-1] * in[n-i];
     }
 }

-- 
Libav/FFmpeg packaging