summaryrefslogtreecommitdiff
path: root/libavcodec/x86/h264_i386.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-12-21 11:39:39 +0100
committerDiego Biurrun <diego@biurrun.de>2011-12-21 12:06:37 +0100
commit6fdb2ce34a765de95c0fe341cbcbfa0b1a21a82d (patch)
treeb72747bb1d3e796c09aed153536adc102cb5e711 /libavcodec/x86/h264_i386.h
parentc18365402bbb6fbfa7854b47c3288f9e31f39f44 (diff)
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.
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
-rw-r--r--libavcodec/x86/h264_i386.h4
1 files changed, 2 insertions, 2 deletions
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 */