[FFmpeg-cvslog] Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 16:05:01 2013 +0200| [946f080b54b009271937035a71ee24b8b856e340] | committer: Michael Niedermayer

Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=946f080b54b009271937035a71ee24b8b856e340
---