aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/cabac.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-11-08 13:46:18 +0100
committerDiego Biurrun <diego@biurrun.de>2011-11-08 17:52:55 +0100
commit276b995d85786dd4af57a9eda798423860cbf3fe (patch)
tree590503cc8e863f683b444d1bbd948af46c75d9db /libavcodec/x86/cabac.h
parentf9324d5adda6147b3faad5970b6d88263397c76b (diff)
downloadffmpeg-276b995d85786dd4af57a9eda798423860cbf3fe.tar.gz
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
Diffstat (limited to 'libavcodec/x86/cabac.h')
-rw-r--r--libavcodec/x86/cabac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index 545cf7c464..5da421a90a 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -82,7 +82,7 @@
"add "tmp" , "low" \n\t"\
"1: \n\t"
-#if ARCH_X86 && HAVE_7REGS && !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)
@@ -99,7 +99,7 @@ static av_always_inline int get_cabac_inline_x86(CABACContext *c,
);
return bit & 1;
}
-#endif /* ARCH_X86 && HAVE_7REGS && !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)