[FFmpeg-cvslog] Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  2 19:03:02 2015 +0200| [f939bf58b22896fadfcfadaddb9c222a86e7ecfa] | committer: Michael Niedermayer

Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
	configure

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

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