[FFmpeg-cvslog] Merge commit '8f4a06faf45c1cbcabec610f4b47824171379934'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Aug 12 12:33:20 2015 +0200| [47c1f36b49122a03bee99e394c586541cd35ec81] | committer: Hendrik Leppkes

Merge commit '8f4a06faf45c1cbcabec610f4b47824171379934'

* commit '8f4a06faf45c1cbcabec610f4b47824171379934':
  checkasm: Remove unnecessary include

See 5e8e121fccc247942a42b609f1e32060950c1a65

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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