Browse Source

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>
tags/n0.10
Martin Storsjö 13 years ago
parent
commit
f1dba9e498
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/x86/cabac.h

+ 2
- 2
libavcodec/x86/cabac.h View File

@@ -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)


Loading…
Cancel
Save