[vlc-commits] deinterlace: fix build

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug  5 19:05:32 2012 +0300| [2903960f17a088e4f7915aaa2826f9dfb769fc41] | committer: Rémi Denis-Courmont

deinterlace: fix build

Regression hidden by 6fe7eb6048e6b3f473006855f4e4905fa54ba910.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2903960f17a088e4f7915aaa2826f9dfb769fc41
---

 modules/video_filter/deinterlace/algo_x.c |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/video_filter/deinterlace/algo_x.c b/modules/video_filter/deinterlace/algo_x.c
index dd5bcd1..e76fec2 100644
--- a/modules/video_filter/deinterlace/algo_x.c
+++ b/modules/video_filter/deinterlace/algo_x.c
@@ -535,8 +535,8 @@ static inline void XDeintBand8x8MMXEXT( uint8_t *dst, int i_dst,
 void RenderX( picture_t *p_outpic, picture_t *p_pic )
 {
     int i_plane;
-#if defined (CAN_COMPILE_MMXEXT) && !defined(__SSE__)
-    const unsigned u_cpu = vlc_CPU();
+#if defined (CAN_COMPILE_MMXEXT)
+    const bool mmxext = vlc_CPU_MMXEXT();
 #endif
 
     /* Copy image and skip lines */
@@ -559,15 +559,11 @@ void RenderX( picture_t *p_outpic, picture_t *p_pic )
             uint8_t *src = &p_pic->p[i_plane].p_pixels[8*y*i_src];
 
 #ifdef CAN_COMPILE_MMXEXT
-# ifndef __SSE__
-            if( u_cpu & VLC_CPU_MMXEXT )
-# endif
+            if( mmxext )
                 XDeintBand8x8MMXEXT( dst, i_dst, src, i_src, i_mbx, i_modx );
             else
 #endif
-#ifndef __SSE__
                 XDeintBand8x8C( dst, i_dst, src, i_src, i_mbx, i_modx );
-#endif
         }
 
         /* Last line (C only)*/
@@ -590,9 +586,7 @@ void RenderX( picture_t *p_outpic, picture_t *p_pic )
     }
 
 #ifdef CAN_COMPILE_MMXEXT
-# ifndef __SSE__
-    if( u_cpu & VLC_CPU_MMXEXT )
-# endif
+    if( mmxext )
         emms();
 #endif
 }