[FFmpeg-cvslog] Merge commit '0f524b6c690962d7ebbd59ded74288e1e9b0f009'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 14:46:38 2014 +0200| [b6c1e80bf4a931bd05d799684842fb3503fff93e] | committer: Michael Niedermayer

Merge commit '0f524b6c690962d7ebbd59ded74288e1e9b0f009'

* commit '0f524b6c690962d7ebbd59ded74288e1e9b0f009':
  x86/synth_filter: remove the fma3 version ifdefs

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

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