[FFmpeg-cvslog] Merge commit '347aa8f72356124ec6b95bf8ebd1faf72db03f8d'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep  2 16:39:52 2018 -0300| [fef55251d82ca1043689dddf5d03aa96c75cd4bb] | committer: James Almer

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 at gmail.com>

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