From 6fdb2ce34a765de95c0fe341cbcbfa0b1a21a82d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 21 Dec 2011 11:39:39 +0100 Subject: x86: Tighten register constraints for decode_significance*_x86. On 32-bit OS X with gcc 4.0/4.2 and shared libraries enabled, the ebx register is not available, but required to assemble the functions. This reverts commit 8742a4f to a simplified version of the original constraints. --- libavcodec/x86/h264_i386.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/x86/h264_i386.h') diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 50e80d0f7a..6cd81feae0 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 HAVE_6REGS && !defined(BROKEN_RELOCATIONS) +#if HAVE_EBX_AVAILABLE && !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){ @@ -144,6 +144,6 @@ static int decode_significance_8x8_x86(CABACContext *c, ); return coeff_count; } -#endif /* HAVE_6REGS && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) */ #endif /* AVCODEC_X86_H264_I386_H */ -- cgit v1.2.3