]> git.sesse.net Git - ffmpeg/commitdiff
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)
* qatar/master:
  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