[FFmpeg-cvslog] Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 19 13:38:55 2014 +0200| [e8fc91e22a608eecccdeb612f91a0998e486426d] | committer: Michael Niedermayer

Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
  configure: Handle armcc 5.0

Conflicts:
	configure

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

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