diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-24 13:04:38 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-24 14:48:49 -0400 |
| commit | e9735572113ab903b92cc0a7931eb894e7177f6e (patch) | |
| tree | ddea2c042c1a42e06990a5abf41faf237b3562dd /libavcodec/dsputil.h | |
| parent | 7ca5338b49aa9967c9b18503490ca656e3bd6c5d (diff) | |
| download | ffmpeg-e9735572113ab903b92cc0a7931eb894e7177f6e.tar.gz | |
Move emms_c() from libavcodec to libavutil.
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 78d21527a5..74230cadbb 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -630,13 +630,6 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ } } -/** - * Empty mmx state. - * this must be called between any dsp function and float/double code. - * for example sin(); dsp->idct_put(); emms_c(); cos() - */ -#define emms_c() - void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); @@ -654,18 +647,7 @@ void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); -#if HAVE_MMX - -#undef emms_c - -static inline void emms(void) -{ - __asm__ volatile ("emms;":::"memory"); -} - -#define emms_c() emms() - -#elif ARCH_ARM +#if ARCH_ARM #if HAVE_NEON # define STRIDE_ALIGN 16 |