RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8' 

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-23 18:28:56 -03:00
parent 0dcfa02fd2 7911186ed6
commit c97e986e90
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/x86/emms.asm
View File

@ -23,8 +23,8 @@
SECTION .text SECTION .text
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void avpriv_emms_yasm(void) ; void avpriv_emms_asm(void)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
cvisible emms_yasm, 0, 0 cvisible emms_asm, 0, 0
emms emms
RET RET

4
libavutil/x86/emms.h
View File

@ -23,7 +23,7 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
void avpriv_emms_yasm(void); void avpriv_emms_asm(void);
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
# define emms_c emms_c # define emms_c emms_c
@ -49,7 +49,7 @@ static av_always_inline void emms_c(void)
# include <mmintrin.h> # include <mmintrin.h>
# define emms_c _mm_empty # define emms_c _mm_empty
#elif HAVE_MMX_EXTERNAL #elif HAVE_MMX_EXTERNAL
# define emms_c avpriv_emms_yasm # define emms_c avpriv_emms_asm
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */
#endif /* AVUTIL_X86_EMMS_H */ #endif /* AVUTIL_X86_EMMS_H */