diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 110d2cbcb123595d075903937d358d5d844bcabb..ba30bef7eaf6f33e232b93979d26096863c15a70 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -202,29 +202,29 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
     /* NOTE: 4 and 8 are very common cases that could be optimized. */
 
     /* general case */
-    for (i = predictor_coef_num + 1; i < output_size; i++) {
+    for (i = predictor_coef_num; i < output_size - 1; i++) {
         int j;
         int val = 0;
-        int error_val = error_buffer[i];
+        int error_val = error_buffer[i + 1];
         int error_sign;
 
         for (j = 0; j < predictor_coef_num; j++) {
-            val += (buffer_out[predictor_coef_num-j] - buffer_out[0]) *
+            val += (buffer_out[i - j] - buffer_out[i - predictor_coef_num]) *
                    predictor_coef_table[j];
         }
 
         val = (val + (1 << (predictor_quantitization - 1))) >>
               predictor_quantitization;
-        val += buffer_out[0] + error_val;
+        val += buffer_out[i - predictor_coef_num] + error_val;
 
-        buffer_out[predictor_coef_num + 1] = sign_extend(val, readsamplesize);
+        buffer_out[i + 1] = sign_extend(val, readsamplesize);
 
         /* adapt LPC coefficients */
         error_sign = sign_only(error_val);
         if (error_sign) {
             for (j = predictor_coef_num - 1; j >= 0 && error_val * error_sign > 0; j--) {
                 int sign;
-                val  = buffer_out[0] - buffer_out[predictor_coef_num - j];
+                val  = buffer_out[i - predictor_coef_num] - buffer_out[i - j];
                 sign = sign_only(val) * error_sign;
                 predictor_coef_table[j] -= sign;
                 val *= sign;
@@ -232,8 +232,6 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer,
                               (predictor_coef_num - j));
             }
         }
-
-        buffer_out++;
     }
 }