Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

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

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

diff --cc libavutil/x86/emms.asm
Simple merge

diff --cc libavutil/x86/emms.h
index 42c18e29536cbfd5fca470355a7dc8c615b6f61b,4b3ebbe7a46dcbfec9543bad847edb1458943107..c21e34b4510a7a4a9680099f826dc9fc31ec598b
--- 1/libavutil/x86/emms.h
--- 2/libavutil/x86/emms.h
+++ b/libavutil/x86/emms.h
@@@ -21,9 -21,8 +21,9 @@@
  
  #include "config.h"
  #include "libavutil/attributes.h"
 +#include "libavutil/cpu.h"
  
- void avpriv_emms_yasm(void);
+ void avpriv_emms_asm(void);
  
  #if HAVE_MMX_INLINE
  #   define emms_c emms_c