diff options
| author | Martin Storsjö <martin@martin.st> | 2011-12-12 14:48:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 15:39:37 +0100 |
| commit | 8349dbfe46140373082f43ca090dac22696afbb4 (patch) | |
| tree | 847c707820c2aef5ac96bff81eaf9885aab5c9df /libavcodec | |
| parent | cd2f7ed0007f4803b6bd845366b2398abb32c355 (diff) | |
| download | ffmpeg-8349dbfe46140373082f43ca090dac22696afbb4.tar.gz | |
x86: Require 7 registers for the cabac asm
The change in 599b4c6ef didn't turn out to work properly on
i386 on OS X, where it broke building with PIC enabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit f1dba9e4988e78738ad9065e4639b82b8355774a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/cabac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index d0d1332094..3c3652d5f0 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -81,7 +81,7 @@ "add "tmp" , "low" \n\t"\ "1: \n\t" -#if HAVE_6REGS && !defined(BROKEN_RELOCATIONS) +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) #define get_cabac_inline get_cabac_inline_x86 static av_always_inline int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) @@ -98,7 +98,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, ); return bit & 1; } -#endif /* HAVE_6REGS && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ #define get_cabac_bypass_sign get_cabac_bypass_sign_x86 static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) |