diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 18:28:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:28:56 -0300 |
| commit | c97e986e90c3f9719b6ba8409744ecdf21a63cf1 (patch) | |
| tree | fb395ee51f051576b7de5baf4d68977b8c2aeac3 | |
| parent | 0dcfa02fd2788f243b8ae123467f3fbfd6587591 (diff) | |
| parent | 7911186ed616ae81dd8617d6d0e8b08c818db9d8 (diff) | |
| download | ffmpeg-c97e986e90c3f9719b6ba8409744ecdf21a63cf1.tar.gz | |
Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/x86/emms.asm | 4 | ||||
| -rw-r--r-- | 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 0aad34af3f..8611762d73 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 42c18e2953..c21e34b451 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 */ |