Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:41:41 +0000 (13:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:46:54 +0000 (13:46 +0100)
commite266e186cf1293b755dbc816fac333f300f7c95f
tree783892d7297a8f4286d1d5cd9578e622747cc806
parent198e55bfa791943fdd477778a8b39180dab52912
parent6abe7edabb7d57e82d7ea6312d30cf05d2192c5b
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>
libavcodec/ffv1enc.c