@@ -54,7 +54,7 @@ These features are supported by all compilers we care about, so we will not | |||||
accept patches to remove their use unless they absolutely do not impair | accept patches to remove their use unless they absolutely do not impair | ||||
clarity and performance. | clarity and performance. | ||||
All code must compile with GCC 2.95 and GCC 3.3. Currently, FFmpeg also | |||||
All code must compile with GCC 3.3. Currently, FFmpeg also | |||||
compiles with several other compilers, such as the Compaq ccc compiler | compiles with several other compilers, such as the Compaq ccc compiler | ||||
or Sun Studio 9, and we would like to keep it that way unless it would | or Sun Studio 9, and we would like to keep it that way unless it would | ||||
be exceedingly involved. To ensure compatibility, please do not use any | be exceedingly involved. To ensure compatibility, please do not use any | ||||
@@ -1647,7 +1647,7 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT | |||||
index[coeff_count++] = last;\ | index[coeff_count++] = last;\ | ||||
} | } | ||||
const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; | const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; | ||||
#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) && HAVE_TEN_OPERANDS | |||||
#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) | |||||
coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, | coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, | ||||
last_coeff_ctx_base-significant_coeff_ctx_base, sig_off); | last_coeff_ctx_base-significant_coeff_ctx_base, sig_off); | ||||
} else { | } else { | ||||
@@ -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) && HAVE_TEN_OPERANDS | |||||
#if ARCH_X86 && 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){ | ||||