Merge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:24:38 +0000 (17:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:24:43 +0000 (17:24 +0200)
commit358d1f6e01e0e9b6e3fac632a40ca9e286b6011a
tree23842d9956e1d024029b55fb6a303baa875f51d9
parentea28034f5d35652ff6a174929fe3ecdbd0cbad35
parent40ffa99dfa39c574d8784a3c4eaf6406198d675d
Merge commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d' into release/2.2

* commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d':
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/hpeldsp_armv6.S