Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 1b260cde49fd3f135f2d60f39e8b8a1ed103d3f1..f07ec08a366bf1c9ca8ce6d643d80188ca553be7 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1168,9 +1168,6 @@ |
# 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. |