diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-11-08 13:46:18 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-11-08 17:52:55 +0100 |
| commit | 276b995d85786dd4af57a9eda798423860cbf3fe (patch) | |
| tree | 590503cc8e863f683b444d1bbd948af46c75d9db | |
| parent | f9324d5adda6147b3faad5970b6d88263397c76b (diff) | |
| download | ffmpeg-276b995d85786dd4af57a9eda798423860cbf3fe.tar.gz | |
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
| -rw-r--r-- | libavcodec/x86/cabac.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 545cf7c464..5da421a90a 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -82,7 +82,7 @@ "add "tmp" , "low" \n\t"\ "1: \n\t" -#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) #define get_cabac_inline get_cabac_inline_x86 static av_always_inline int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) @@ -99,7 +99,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, ); return bit & 1; } -#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ #define get_cabac_bypass_sign get_cabac_bypass_sign_x86 static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index f32310ca0c..7a361cdb37 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -36,7 +36,7 @@ //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //as that would make optimization work hard) -#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index, x86_reg last_off){ @@ -145,6 +145,6 @@ static int decode_significance_8x8_x86(CABACContext *c, ); return coeff_count; } -#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ #endif /* AVCODEC_X86_H264_I386_H */ |