Commit 8349dbfe authored by Martin Storsjö's avatar Martin Storsjö Committed by Michael Niedermayer

x86: Require 7 registers for the cabac asm

The change in 599b4c6e didn't turn out to work properly on
i386 on OS X, where it broke building with PIC enabled.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
(cherry picked from commit f1dba9e4)
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent cd2f7ed0
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"add "tmp" , "low" \n\t"\ "add "tmp" , "low" \n\t"\
"1: \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 #define get_cabac_inline get_cabac_inline_x86
static av_always_inline int get_cabac_inline_x86(CABACContext *c, static av_always_inline int get_cabac_inline_x86(CABACContext *c,
uint8_t *const state) uint8_t *const state)
...@@ -98,7 +98,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c, ...@@ -98,7 +98,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
); );
return bit & 1; 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 #define get_cabac_bypass_sign get_cabac_bypass_sign_x86
static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val) static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment