[FFmpeg-cvslog] Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 19:16:42 2014 +0200| [7e4e45d227e13972209fad39fc1bff9eddbdd905] | committer: Michael Niedermayer

Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d'

* commit '9f8cf50e3be04b8e178086edaa4598826143303d':
  configure: Enable gas-preprocessor on all OSes but only if available

Conflicts:
	configure

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

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