Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:28:56 +0000 (18:28 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:28:56 +0000 (18:28 -0300)
commitc97e986e90c3f9719b6ba8409744ecdf21a63cf1
treefb395ee51f051576b7de5baf4d68977b8c2aeac3
parent0dcfa02fd2788f243b8ae123467f3fbfd6587591
parent7911186ed616ae81dd8617d6d0e8b08c818db9d8
Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
  emms: Give apriv_emms_yasm() a more general name

Merged-by: James Almer <jamrial@gmail.com>
libavutil/x86/emms.asm
libavutil/x86/emms.h