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)
* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function

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

Simple merge
Simple merge
Simple merge