[MPlayer-cvslog] r28327 - in trunk: libaf/af_resample.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_yadif.c libvo/aclib.c

[reimar]

Author: reimar
Date: Fri Jan 16 10:32:54 2009
New Revision: 28327

Log:
More #ifdef HAVE_MMX etc. missed by earlier search.

Modified:
   trunk/libaf/af_resample.c
   trunk/libmpcodecs/vf_filmdint.c
   trunk/libmpcodecs/vf_yadif.c
   trunk/libvo/aclib.c

Modified: trunk/libaf/af_resample.c
==============================================================================
--- trunk/libaf/af_resample.c	Fri Jan 16 10:29:20 2009	(r28326)
+++ trunk/libaf/af_resample.c	Fri Jan 16 10:32:54 2009	(r28327)
@@ -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

Modified: trunk/libmpcodecs/vf_filmdint.c
==============================================================================
--- trunk/libmpcodecs/vf_filmdint.c	Fri Jan 16 10:29:20 2009	(r28326)
+++ trunk/libmpcodecs/vf_filmdint.c	Fri Jan 16 10:32:54 2009	(r28327)
@@ -433,7 +433,7 @@ block_metrics_3dnow(unsigned char *a, un
 		    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, uns
 		   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*
     }
     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;

Modified: trunk/libmpcodecs/vf_yadif.c
==============================================================================
--- trunk/libmpcodecs/vf_yadif.c	Fri Jan 16 10:29:20 2009	(r28326)
+++ trunk/libmpcodecs/vf_yadif.c	Fri Jan 16 10:32:54 2009	(r28327)
@@ -68,7 +68,7 @@ static void store_ref(struct vf_priv_s *
     }
 }
 
-#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_p
 #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, 
             }
         }
     }
-#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*
     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
 

Modified: trunk/libvo/aclib.c
==============================================================================
--- trunk/libvo/aclib.c	Fri Jan 16 10:29:20 2009	(r28326)
+++ trunk/libvo/aclib.c	Fri Jan 16 10:32:54 2009	(r28327)
@@ -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