Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 02:59:11 +0000 (03:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 02:59:18 +0000 (03:59 +0100)
* qatar/release/9:
  arm: hpeldsp: prevent overreads in armv6 asm

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

Simple merge
Simple merge