Merge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:21:35 +0000 (03:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:21:35 +0000 (03:21 +0100)
commitfb62580fb6cb3f9dfa684b52a8c0a747d1f29167
treed0348a555ef157b2cec660dd5559bb598df88c8e
parent55c6a482d4fcc031d76bdd6068e78ec9b4c4bec6
parent3f09d4f6d43468dbc9307bb937516a32287008dc
Merge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4

* commit '3f09d4f6d43468dbc9307bb937516a32287008dc':
  ffv1: fix out-of-bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1enc.c