Merge commit 'a1ab3300c83a16c2d5f5d29c51393668b9d92667' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 09:31:47 +0000 (10:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 09:31:47 +0000 (10:31 +0100)
* commit 'a1ab3300c83a16c2d5f5d29c51393668b9d92667':
  arm: hpeldsp: prevent overreads in armv6 asm

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

Simple merge
Simple merge