xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-16 18:11:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory

Browse Source
This commit is contained in:
Diego Biurrun 2011-11-08 13:46:18 +01:00
parent f9324d5add
commit 276b995d85
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/cabac.h
View File

@ -82,7 +82,7 @@
"add "tmp" , "low" \n\t"\ "add "tmp" , "low" \n\t"\
"1: \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 #define get_cabac_inline get_cabac_inline_x86
static av_always_inline int get_cabac_inline_x86(CABACContext *c, static av_always_inline int get_cabac_inline_x86(CABACContext *c,
uint8_t *const state) uint8_t *const state)
@ -99,7 +99,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
); );
return bit & 1; 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 #define get_cabac_bypass_sign get_cabac_bypass_sign_x86
static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)

4
libavcodec/x86/h264_i386.h
View File

@ -36,7 +36,7 @@
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
//as that would make optimization work hard) //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, static int decode_significance_x86(CABACContext *c, int max_coeff,
uint8_t *significant_coeff_ctx_base, uint8_t *significant_coeff_ctx_base,
int *index, x86_reg last_off){ int *index, x86_reg last_off){
@ -145,6 +145,6 @@ static int decode_significance_8x8_x86(CABACContext *c,
); );
return coeff_count; return coeff_count;
} }
#endif /* ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ #endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
#endif /* AVCODEC_X86_H264_I386_H */ #endif /* AVCODEC_X86_H264_I386_H */