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)
* commit '40ffa99dfa39c574d8784a3c4eaf6406198d675d':
  arm: hpeldsp: prevent overreads in armv6 asm

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

Simple merge