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@stupeflix.com>
This commit is contained in:
Matthieu Bouron 2016-06-27 17:18:25 +02:00
commit 39d6d3618d

Diff Content Not Available