diff options
-rw-r--r-- | libaf/af_resample.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_filmdint.c | 10 | ||||
-rw-r--r-- | libmpcodecs/vf_yadif.c | 8 | ||||
-rw-r--r-- | libvo/aclib.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libaf/af_resample.c b/libaf/af_resample.c index c2cfb4b74f..57335532c4 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -36,7 +36,7 @@ slow and to 16 if the machine is fast and has MMX. */ -#if !defined(HAVE_MMX) // This machine is slow +#if !HAVE_MMX // This machine is slow #define L8 #else #define L16 diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 2658153c27..4313d50692 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -433,7 +433,7 @@ block_metrics_3dnow(unsigned char *a, unsigned char *b, int as, int bs, int lines, struct vf_priv_s *p, struct frame_stats *s) { struct metrics tm; -#ifndef HAVE_3DNOW +#if !HAVE_3DNOW mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_3dnow: internal error\n"); #else static const unsigned long long ones = 0x0101010101010101ull; @@ -462,7 +462,7 @@ block_metrics_mmx2(unsigned char *a, unsigned char *b, int as, int bs, int lines, struct vf_priv_s *p, struct frame_stats *s) { struct metrics tm; -#ifndef HAVE_MMX +#if !HAVE_MMX mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_mmx2: internal error\n"); #else static const unsigned long long ones = 0x0101010101010101ull; @@ -591,7 +591,7 @@ static inline int dint_copy_line_mmx2(unsigned char *dst, unsigned char *a, long bos, long cos, int ds, int ss, int w, int t) { -#ifndef HAVE_MMX +#if !HAVE_MMX mp_msg(MSGT_VFILTER, MSGL_FATAL, "dint_copy_line_mmx2: internal error\n"); return 0; #else @@ -1422,10 +1422,10 @@ static int open(vf_instance_t *vf, char* args) } if (p->mmx2 > 2) p->mmx2 = 0; -#ifndef HAVE_MMX +#if !HAVE_MMX p->mmx2 = 0; #endif -#ifndef HAVE_3DNOW +#if !HAVE_3DNOW p->mmx2 &= 1; #endif p->thres.odd = p->thres.even; diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index a8328d3f2a..5a36b3caea 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -68,7 +68,7 @@ static void store_ref(struct vf_priv_s *p, uint8_t *src[3], int src_stride[3], i } } -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) #define LOAD4(mem,dst) \ "movd "mem", "#dst" \n\t"\ @@ -281,7 +281,7 @@ static void filter_line_mmx2(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, u #undef CHECK2 #undef FILTER -#endif /* defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) */ +#endif /* HAVE_MMX && defined(NAMED_ASM_ARGS) */ static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity){ int x; @@ -363,7 +363,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int } } } -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) if(gCpuCaps.hasMMX2) __asm__ volatile("emms \n\t" : : : "memory"); #endif } @@ -501,7 +501,7 @@ static int open(vf_instance_t *vf, char* args){ if (args) sscanf(args, "%d:%d", &vf->priv->mode, &vf->priv->parity); filter_line = filter_line_c; -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) if(gCpuCaps.hasMMX2) filter_line = filter_line_mmx2; #endif diff --git a/libvo/aclib.c b/libvo/aclib.c index ca06b84ad5..024cf06a6b 100644 --- a/libvo/aclib.c +++ b/libvo/aclib.c @@ -24,7 +24,7 @@ //Note: we have MMX, MMX2, 3DNOW version there is no 3DNOW+MMX2 one //Plain C versions -//#if !defined (HAVE_MMX) || defined (RUNTIME_CPUDETECT) +//#if !HAVE_MMX || defined (RUNTIME_CPUDETECT) //#define COMPILE_C //#endif |