[FFmpeg-cvslog] Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  5 19:31:08 2014 +0200| [00d234688512c83f3e62b6781676469b78f4ab2b] | committer: Michael Niedermayer

Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
	configure

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

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