[FFmpeg-cvslog] Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:28:56 2017 -0300| [c97e986e90c3f9719b6ba8409744ecdf21a63cf1] | committer: James Almer

Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

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

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

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

 libavutil/x86/emms.asm | 4 ++--
 libavutil/x86/emms.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
index 0aad34a..8611762 100644
--- a/libavutil/x86/emms.asm
+++ b/libavutil/x86/emms.asm
@@ -23,8 +23,8 @@
 SECTION .text
 
 ;-----------------------------------------------------------------------------
-; void avpriv_emms_yasm(void)
+; void avpriv_emms_asm(void)
 ;-----------------------------------------------------------------------------
-cvisible emms_yasm, 0, 0
+cvisible emms_asm, 0, 0
     emms
     RET
diff --git a/libavutil/x86/emms.h b/libavutil/x86/emms.h
index 42c18e2..c21e34b 100644
--- a/libavutil/x86/emms.h
+++ b/libavutil/x86/emms.h
@@ -23,7 +23,7 @@
 #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
@@ -49,7 +49,7 @@ static av_always_inline void emms_c(void)
 #   include <mmintrin.h>
 #   define emms_c _mm_empty
 #elif HAVE_MMX_EXTERNAL
-#   define emms_c avpriv_emms_yasm
+#   define emms_c avpriv_emms_asm
 #endif /* HAVE_MMX_INLINE */
 
 #endif /* AVUTIL_X86_EMMS_H */


======================================================================

diff --cc libavutil/x86/emms.h
index 42c18e2,4b3ebbe..c21e34b
--- a/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