]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 10:11:18 +0000 (12:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 10:11:23 +0000 (12:11 +0200)
* qatar/master:
  arm: Add VFP-accelerated version of qmf_32_subbands

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

Simple merge
Simple merge