diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-12-21 11:39:39 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-12-21 12:06:37 +0100 |
| commit | 6fdb2ce34a765de95c0fe341cbcbfa0b1a21a82d (patch) | |
| tree | b72747bb1d3e796c09aed153536adc102cb5e711 | |
| parent | c18365402bbb6fbfa7854b47c3288f9e31f39f44 (diff) | |
| download | ffmpeg-6fdb2ce34a765de95c0fe341cbcbfa0b1a21a82d.tar.gz | |
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.
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index fdeb1ba470..a96f52e004 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1656,7 +1656,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, index[coeff_count++] = last;\ } const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; -#if ARCH_X86 && HAVE_6REGS && !defined(BROKEN_RELOCATIONS) +#if ARCH_X86 && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, last_coeff_ctx_base, sig_off); } else { 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 */ |