Skip to content

Commit 3ba3abb

Browse files
committed
Don't try to set HAVE_EBP_AVAILABLE on posix x86.
https://bugs.chromium.org/p/chromium/issues/detail?id=796379
1 parent f6599e9 commit 3ba3abb

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

patch/patches/ffmpeg.patch

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
diff --git a/BUILD.gn b/BUILD.gn
2-
index b82808b973..f8924f9e39 100755
2+
index 01535c488b..180c1a7769 100755
33
--- BUILD.gn
44
+++ BUILD.gn
5-
@@ -415,6 +415,12 @@ if (is_component_ffmpeg) {
5+
@@ -247,7 +247,7 @@ target(link_target_type, "ffmpeg_internal") {
6+
# On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
7+
# insufficient registers unless we disable EBP usage. crbug.com/786760
8+
if (target_cpu == "x86") {
9+
- if (using_sanitizer) {
10+
+ if (true) {
11+
defines += [ "HAVE_EBP_AVAILABLE=0" ]
12+
} else {
13+
defines += [ "HAVE_EBP_AVAILABLE=1" ]
14+
@@ -393,6 +393,12 @@ if (is_component_ffmpeg) {
615
# So we can append below and assume they're defined.
716
ldflags = []
817

0 commit comments

Comments
 (0)