[x264-devel] commit: Fix compile error with high bit depth and disable-asm (Daniel Kang )

[git at videolan.org]

x264 | branch: master | Daniel Kang <daniel.d.kang at gmail.com> | Fri Jan  7 23:05:50 2011 -0500| [147e8eb6f9b0a9d50b993c80da4f82eb5c06d50e] | committer: Jason Garrett-Glaser 

Fix compile error with high bit depth and disable-asm

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=147e8eb6f9b0a9d50b993c80da4f82eb5c06d50e
---

 common/dct.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/dct.c b/common/dct.c
index 548c2dc..e7926dd 100644
--- a/common/dct.c
+++ b/common/dct.c
@@ -733,10 +733,12 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         pf->sub_4x4    = zigzag_sub_4x4_field;
         pf->sub_4x4ac  = zigzag_sub_4x4ac_field;
 #if HIGH_BIT_DEPTH
+#if HAVE_MMX
         if( cpu&X264_CPU_SSE2 )
             pf->scan_4x4 = x264_zigzag_scan_4x4_field_sse2;
         if( cpu&X264_CPU_SSE4 )
             pf->scan_8x8 = x264_zigzag_scan_8x8_field_sse4;
+#endif // HAVE_MMX
 #else
 #if HAVE_MMX
         if( cpu&X264_CPU_MMXEXT )
@@ -749,8 +751,7 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
             pf->sub_4x4  = x264_zigzag_sub_4x4_field_ssse3;
             pf->sub_4x4ac= x264_zigzag_sub_4x4ac_field_ssse3;
         }
-#endif
-
+#endif // HAVE_MMX
 #if HAVE_ALTIVEC
         if( cpu&X264_CPU_ALTIVEC )
             pf->scan_4x4   = x264_zigzag_scan_4x4_field_altivec;
@@ -765,11 +766,13 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
         pf->sub_4x4    = zigzag_sub_4x4_frame;
         pf->sub_4x4ac  = zigzag_sub_4x4ac_frame;
 #if HIGH_BIT_DEPTH
+#if HAVE_MMX
         if( cpu&X264_CPU_SSE2 )
         {
             pf->scan_4x4 = x264_zigzag_scan_4x4_frame_sse2;
             pf->scan_8x8 = x264_zigzag_scan_8x8_frame_sse2;
         }
+#endif // HAVE_MMX
 #else
 #if HAVE_MMX
         if( cpu&X264_CPU_MMX )
@@ -786,8 +789,7 @@ void x264_zigzag_init( int cpu, x264_zigzag_function_t *pf, int b_interlaced )
             if( cpu&X264_CPU_SHUFFLE_IS_FAST )
                 pf->scan_4x4 = x264_zigzag_scan_4x4_frame_ssse3;
         }
-#endif
-
+#endif // HAVE_MMX
 #if HAVE_ALTIVEC
         if( cpu&X264_CPU_ALTIVEC )
             pf->scan_4x4   = x264_zigzag_scan_4x4_frame_altivec;