[FFmpeg-cvslog] Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  4 12:45:29 2014 +0200| [a40c338a00a4e1c7f2cce189db0f406f85d5792a] | committer: Michael Niedermayer

Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

* commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412':
  build: check if AS supports the '.func' directive

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

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