mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 12:40:01 +00:00
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
This commit is contained in:
parent
f9324d5add
commit
276b995d85
@ -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)
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user