Last active
September 21, 2020 16:27
-
-
Save 1480c1/86830546ed555b50f91a023100e526a9 to your computer and use it in GitHub Desktop.
ffmpeg, 32-bit clang test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 310f489fd044894c0678f55ecef62348ed4aca15 Mon Sep 17 00:00:00 2001 | |
From: Christopher Degawa <ccom@randomderp.com> | |
Date: Mon, 21 Sep 2020 15:16:32 +0000 | |
Subject: [PATCH] get_cabac_inline_x86: Don't inline if 32-bit clang on windows | |
Signed-off-by: Christopher Degawa <ccom@randomderp.com> | |
--- | |
libavcodec/x86/cabac.h | 9 +++++++-- | |
1 file changed, 7 insertions(+), 2 deletions(-) | |
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h | |
index cfd3b759c9..db27b1e720 100644 | |
--- a/libavcodec/x86/cabac.h | |
+++ b/libavcodec/x86/cabac.h | |
@@ -175,8 +175,13 @@ | |
#if HAVE_7REGS && !BROKEN_COMPILER | |
#define get_cabac_inline get_cabac_inline_x86 | |
-static av_always_inline int get_cabac_inline_x86(CABACContext *c, | |
- uint8_t *const state) | |
+static | |
+#if defined(_WIN32) && !defined(_WIN64) && defined(__clang__) | |
+av_noinline | |
+#else | |
+av_always_inline | |
+#endif | |
+int get_cabac_inline_x86(CABACContext *c, uint8_t *const state) | |
{ | |
int bit, tmp; | |
#ifdef BROKEN_RELOCATIONS | |
-- | |
2.25.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment