OpenCL lookahead

[x264] / common / bitstream.c

diff --git a/common/bitstream.c b/common/bitstream.c
index a2d20a9c55a9a9c10d20e79cdece1374dd6aa293..c056ffbd76b2411392538ac4a31c6e11bf8ccbd1 100644 (file)
--- a/common/bitstream.c
+++ b/common/bitstream.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bitstream.c: bitstream writing
  *****************************************************************************
- * Copyright (C) 2003-2010 x264 project
+ * Copyright (C) 2003-2013 x264 project
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Fiona Glaser <fiona@x264.com>
@@ -39,9 +39,10 @@ static uint8_t *x264_nal_escape_c( uint8_t *dst, uint8_t *src, uint8_t *end )
     return dst;
 }
 
-#ifdef HAVE_MMX
-uint8_t *x264_nal_escape_mmxext( uint8_t *dst, uint8_t *src, uint8_t *end );
+#if HAVE_MMX
+uint8_t *x264_nal_escape_mmx2( uint8_t *dst, uint8_t *src, uint8_t *end );
 uint8_t *x264_nal_escape_sse2( uint8_t *dst, uint8_t *src, uint8_t *end );
+uint8_t *x264_nal_escape_avx( uint8_t *dst, uint8_t *src, uint8_t *end );
 #endif
 
 /****************************************************************************
@@ -88,10 +89,12 @@ void x264_nal_encode( x264_t *h, uint8_t *dst, x264_nal_t *nal )
 void x264_bitstream_init( int cpu, x264_bitstream_function_t *pf )
 {
     pf->nal_escape = x264_nal_escape_c;
-#ifdef HAVE_MMX
-    if( cpu&X264_CPU_MMXEXT )
-        pf->nal_escape = x264_nal_escape_mmxext;
+#if HAVE_MMX
+    if( cpu&X264_CPU_MMX2 )
+        pf->nal_escape = x264_nal_escape_mmx2;
     if( (cpu&X264_CPU_SSE2) && (cpu&X264_CPU_SSE2_IS_FAST) )
         pf->nal_escape = x264_nal_escape_sse2;
+    if( cpu&X264_CPU_AVX )
+        pf->nal_escape = x264_nal_escape_avx;
 #endif
 }