Merge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:44:04 +0000 (09:44 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:44:04 +0000 (09:44 +0200)
commit1ea0df14c367d7c6584b4bcbc2aaae5acc685634
treef1bbbd0dbf3d256f601c1e11c8a181826c83252f
parentebce1332285b16418dacb369defcfd7bae06d319
parent0361e4dcb4d394c88c33364415a3b8fe315b67d1
Merge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'

* commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1':
  h264_qpel: x86: Move function with only one instance out of template macro

Note: warning is present with clang.

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavcodec/x86/h264_qpel.c