[FFmpeg-cvslog] Merge commit '5a272190a04666f0fe41be767396b30712638c21'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 03:44:06 2014 +0200| [c67cf84628bcc81a0a45dd41bedd1c31dc12f7a7] | committer: Michael Niedermayer

Merge commit '5a272190a04666f0fe41be767396b30712638c21'

* commit '5a272190a04666f0fe41be767396b30712638c21':
  armv6: Accelerate butterflies_float

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

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