diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
| commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
| tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libmpcodecs/vf_noise.c | |
| parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
| parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
| download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz | |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libmpcodecs/vf_noise.c')
| -rw-r--r-- | libmpcodecs/vf_noise.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 02fe9d9e16..aab612c2b8 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -145,7 +145,7 @@ static int8_t *initNoise(FilterParam *fp){ /***************************************************************************/ -#ifdef HAVE_MMX +#if HAVE_MMX static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int len, int shift){ long mmx_len= len&(~7); noise+=shift; @@ -174,7 +174,7 @@ static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int #endif //duplicate of previous except movntq -#ifdef HAVE_MMX2 +#if HAVE_MMX2 static inline void lineNoise_MMX2(uint8_t *dst, uint8_t *src, int8_t *noise, int len, int shift){ long mmx_len= len&(~7); noise+=shift; @@ -216,7 +216,7 @@ static inline void lineNoise_C(uint8_t *dst, uint8_t *src, int8_t *noise, int le /***************************************************************************/ -#ifdef HAVE_MMX +#if HAVE_MMX static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t **shift){ long mmx_len= len&(~7); @@ -356,10 +356,10 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ vf_clone_mpi_attributes(dmpi, mpi); -#ifdef HAVE_MMX +#if HAVE_MMX if(gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t"); #endif -#ifdef HAVE_MMX2 +#if HAVE_MMX2 if(gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t"); #endif @@ -447,13 +447,13 @@ static int open(vf_instance_t *vf, char* args){ } -#ifdef HAVE_MMX +#if HAVE_MMX if(gCpuCaps.hasMMX){ lineNoise= lineNoise_MMX; lineNoiseAvg= lineNoiseAvg_MMX; } #endif -#ifdef HAVE_MMX2 +#if HAVE_MMX2 if(gCpuCaps.hasMMX2) lineNoise= lineNoise_MMX2; // if(gCpuCaps.hasMMX) lineNoiseAvg= lineNoiseAvg_MMX2; #endif |