Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:34:08 +0000 (21:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Mar 2014 20:35:30 +0000 (21:35 +0100)
commita74bab7079d7a6d0a6c7859dcc35365c32795674
treeecd3ebb6d41e74d173034a5104e4590c2797592c
parent146b476ba0c99a45caae8559a2e905cbbb79a35b
parentcbddee1cca0ebd01e8c5aa694d31228eb4de4b41
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm

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