summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 42ccd77..ab2d892 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1156,6 +1156,9 @@
# http://code.google.com/p/googletest/source/detail?r=446 .
# TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
'-Wno-unnamed-type-template-args',
+ # The integrated assembler chokes on one ffmpeg file.
+ # http://crbug.com/61931
+ '-no-integrated-as',
],
'cflags!': [
# Clang doesn't seem to know know this flag.