Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:07:09 +0000 (11:07 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 09:07:09 +0000 (11:07 +0200)
commit80f91c8d5a6f3c708dd55c3f8e86cbeffcd6bc0e
tree4a5df8c6b8d8f549e7b721fa230b2ee6223d8e19
parent8524b0162f01272dcefbcbbe79b2b90f117088f1
parent3cba09e5228c889d63814dc43bc68f15c9dbac77
Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'

* commit '3cba09e5228c889d63814dc43bc68f15c9dbac77':
  x86: Drop stray semicolons after function definitions

This commit is a noop, they are already fixed in FFmpeg.

Merged-by: Clément Bœsch <cboesch@gopro.com>