diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-18 03:21:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-18 03:21:35 +0100 |
| commit | fb62580fb6cb3f9dfa684b52a8c0a747d1f29167 (patch) | |
| tree | d0348a555ef157b2cec660dd5559bb598df88c8e | |
| parent | 55c6a482d4fcc031d76bdd6068e78ec9b4c4bec6 (diff) | |
| parent | 3f09d4f6d43468dbc9307bb937516a32287008dc (diff) | |
Merge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4
* commit '3f09d4f6d43468dbc9307bb937516a32287008dc':
ffv1: fix out-of-bounds read
Merged-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/ffv1enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index e2d3707710..cf2a13dc6b 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -166,7 +166,7 @@ static void find_best_state(uint8_t best_state[256][256], 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[256 - one_state[256 - m]] += occ[m] * (1 - p); |