[FFmpeg-cvslog] Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 16 21:46:02 2015 +0100| [1904704a48b7ced8d5bb9091fe47a28b4bbe619b] | committer: Michael Niedermayer

Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
	configure

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

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