Reenable AMD64 optimizations for cabac accidentially disabled in r6852

Originally committed as revision 6853 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/cabac.h

@@ -28,9 +28,6 @@
 
 //#undef NDEBUG
 #include <assert.h>
-#ifdef ARCH_X86_64
-#define ARCH_X86
-#endif
 #ifdef ARCH_X86
 #include "x86_cpu.h"
 #endif
@@ -379,7 +376,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state
 #define BYTE        "16"
 #define BYTEEND     "20"
 #endif
-#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__))
+#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
     int bit;
 
 #ifndef BRANCHLESS_CABAC_DECODER
@@ -535,7 +532,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state
     );
     bit&=1;
 #endif /* BRANCHLESS_CABAC_DECODER */
-#else /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */
+#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
     int s = *state;
     int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s];
     int bit, lps_mask attribute_unused;
@@ -574,7 +571,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state
     if(!(c->low & CABAC_MASK))
         refill2(c);
 #endif /* BRANCHLESS_CABAC_DECODER */
-#endif /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */
+#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
     return bit;
 }
 
@@ -683,7 +680,7 @@ static always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
 
 //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
 //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
-#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__))
+#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
     void *end= significant_coeff_ctx_base + max_coeff - 1;
     int minusstart= -(int)significant_coeff_ctx_base;
@@ -789,7 +786,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe
     );
     return coeff_count;
 }
-#endif /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */
+#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
 
 /**
  *

libavcodec/h264.c

@@ -6139,7 +6139,7 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
             index[coeff_count++] = last;\
         }
         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__))
+#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
     } else {
         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);