Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Mon, 27 Jun 2016 15:18:25 +0000 (17:18 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Mon, 27 Jun 2016 15:18:25 +0000 (17:18 +0200)
commit39d6d3618d48625decaff7d9bdbb45b44ef2a805
treea909615b06a988485fea5629b559308ff94ea95b
parentd693392886b8454c818e384c816b9ede53c570d8
parent1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e
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>