Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:05:01 +0000 (16:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:05:04 +0000 (16:05 +0200)
commit946f080b54b009271937035a71ee24b8b856e340
tree30db756728f683b8dfe0d2640e9d4ad0133f52a8
parent99e7c702db5c42a79aaa48c502fec3e15d8cf308
parent7ffda66fd5c81af4725bff7c2c4f207ba2aa0613
Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/arm/float_dsp_arm.h
libavutil/arm/float_dsp_init_arm.c
libavutil/arm/float_dsp_init_vfp.c