[FFmpeg-cvslog] Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'

[Matthieu Bouron]

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Mon Jun 27 17:18:25 2016 +0200| [39d6d3618d48625decaff7d9bdbb45b44ef2a805] | committer: Matthieu Bouron

Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'

* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
  asm: FF_-prefix internal macros used in inline assembly

This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.

Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>

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