]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '347aa8f72356124ec6b95bf8ebd1faf72db03f8d'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:39:52 +0000 (16:39 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:39:52 +0000 (16:39 -0300)
* commit '347aa8f72356124ec6b95bf8ebd1faf72db03f8d':
  x86: Don't declare a non-static function as inline

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge