[FFmpeg-cvslog] Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  6 20:35:53 2014 +0200| [40a820d6d8653f604414e770fd200b4868ab87ef] | committer: Michael Niedermayer

Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'

* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f':
  configure: Include the armcc build number in the compiler identification

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

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