x86: Fix constraints for decode_significance*_x86
authorMartin Storsjö <martin@martin.st>
Mon, 26 Dec 2011 19:47:20 +0000 (21:47 +0200)
committerMartin Storsjö <martin@martin.st>
Tue, 27 Dec 2011 07:05:14 +0000 (09:05 +0200)
commit676a9ee1d2f88e320a00d56c47bdac86881bc75b
treeb039edb7317312ca3219b760dfa7bda267259049
parent723c35feb0d913e07e7f5a3b6be94cb0b79fd086
x86: Fix constraints for decode_significance*_x86

Originally, prior to 8742a4ff8, the caller code was compiled
within this condition:

ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)

Since HAVE_7REGS is defined as
(ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
the subcondition HAVE_7REGS && HAVE_EBX_AVAILABLE is equal
to HAVE_7REGS (for 32 bit at least). The correct simplification
of the original condition thus is HAVE_7REGS, not
HAVE_EBX_AVAILABLE.

This fixes compilation in some cases where HAVE_EBP_AVAILABLE = 0
and HAVE_EBX_AVAILABLE = 1.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/h264_cabac.c
libavcodec/x86/h264_i386.h