virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avutil: Ensure that emms_c is always defined, even on non-x86

Browse Source
This commit is contained in:
Diego Biurrun
2013-02-14 19:07:21 +01:00
parent 759a3a2177
commit 4db96649ca
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/internal.h
View File

@@ -43,6 +43,10 @@
# include "x86/emms.h" # include "x86/emms.h"
#endif #endif
#ifndef emms_c
# define emms_c()
#endif
#ifndef attribute_align_arg #ifndef attribute_align_arg
#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
# define attribute_align_arg __attribute__((force_align_arg_pointer)) # define attribute_align_arg __attribute__((force_align_arg_pointer))

5
libavutil/x86/emms.h
View File

@@ -25,6 +25,7 @@
void avpriv_emms_yasm(void); void avpriv_emms_yasm(void);
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
# define emms_c emms_c
/** /**
* Empty mmx state. * Empty mmx state.
* this must be called between any dsp function and float/double code. * this must be called between any dsp function and float/double code.
@@ -37,10 +38,8 @@ static av_always_inline void emms_c(void)
#elif HAVE_MMX && HAVE_MM_EMPTY #elif HAVE_MMX && HAVE_MM_EMPTY
# include <mmintrin.h> # include <mmintrin.h>
# define emms_c _mm_empty # define emms_c _mm_empty
#elif HAVE_MMX && HAVE_YASM #elif HAVE_MMX_EXTERNAL
# define emms_c avpriv_emms_yasm # define emms_c avpriv_emms_yasm
#else
# define emms_c()
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */
#endif /* AVUTIL_X86_EMMS_H */ #endif /* AVUTIL_X86_EMMS_H */