Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:56:04 +0000 (11:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 09:57:05 +0000 (11:57 +0200)
commit2305a6775dd6fe6e55f985b09b7a0741f001d76a
treed13b93f9d8d92643198385baf8279e17471ab01c
parent3cab2280058c582102346a50a8a503216055bc2d
parentb63bb251ea6d6ba23295294e37a92625c0192206
Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'

* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
  arm: Add VFP-accelerated version of imdct_half

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/fft_init_arm.c
libavcodec/arm/mdct_vfp.S
libavcodec/arm/synth_filter_vfp.S