]> git.sesse.net Git - ffmpeg/commit
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)
commitfef55251d82ca1043689dddf5d03aa96c75cd4bb
treeb408870212e8687c2cff34e8cf25f53244f1c6c6
parentb09a092edd55ab6185db4f29cf96aa5ab85484fe
parent347aa8f72356124ec6b95bf8ebd1faf72db03f8d
Merge commit '347aa8f72356124ec6b95bf8ebd1faf72db03f8d'

* commit '347aa8f72356124ec6b95bf8ebd1faf72db03f8d':
  x86: Don't declare a non-static function as inline

This commit is a noop

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