[FFmpeg-cvslog] Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 17:36:48 2016 +0000| [ca408cf557b879cd08570c0b93ad98d40baec667] | committer: Derek Buitenhuis

Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'

* commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f':
  checkasm: Use standard multiple inclusion guards

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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