Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b'

* commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ffv1enc.c
index e2d3707,93630b4..cf2a13d
--- 1/libavcodec/ffv1enc.c
--- 2/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@@ -166,9 -71,9 +166,9 @@@ static void find_best_state(uint8_t bes
                      best_len[k]      = len;
                      best_state[i][k] = j;
                  }
-                 for (m = 0; m < 256; m++)
+                 for (m = 1; m < 256; m++)
                      if (occ[m]) {
 -                        newocc[one_state[m]]             += occ[m] * p;
 +                        newocc[      one_state[      m]] += occ[m] * p;
                          newocc[256 - one_state[256 - m]] += occ[m] * (1 - p);
                      }
                  memcpy(occ, newocc, sizeof(occ));