Update FFmpeg code to n3.2-65-gee56777

1 files changed, 25 insertions, 1 deletions

diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/media/ffvpx/ffvpxcommon.mozbuild
index 3a83f781d3..6d17e88074 100644
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/media/ffvpx/ffvpxcommon.mozbuild
@@ -43,12 +43,19 @@ if CONFIG['GNU_CC']:
         '-Wno-switch',
         '-Wno-type-limits',
         '-Wno-unused-function',
+        # XXX This does not seem to have any effect on some versions of GCC.
         '-Wno-deprecated-declarations',
     ]
     if CONFIG['CLANG_CXX']:
         CFLAGS += [
             '-Wno-incompatible-pointer-types-discards-qualifiers',
-            '-Wno-logical-op-parentheses',
+            '-Wno-string-conversion',
+            '-Wno-visibility',
+        ]
+    else:
+        CFLAGS += [
+            '-Wno-discarded-qualifiers',
+            '-Wno-maybe-uninitialized',
         ]
     # Force visibility of cpu and av_log symbols.
     CFLAGS += ['-include', 'libavutil_visibility.h']
@@ -73,6 +80,8 @@ elif CONFIG['_MSC_VER']:
         '-wd4245', # conversion from 'int' to 'uint32_t', signed/unsigned mismatch
         '-wd4703', # potentially uninitialized local pointer
         '-wd4293', # '<<' : shift count negative or too big, undefined behavior
+        '-wd4334', # '<<' : result of 32-bit shift implicitly converted to 64 bits
+        '-wd4996', # The compiler encountered a deprecated declaration.
         # from FFmpeg configure
         '-wd4244', '-wd4127', '-wd4018', '-wd4389', '-wd4146', '-wd4701',
         '-wd4057', '-wd4204', '-wd4706', '-wd4305', '-wd4152', '-wd4324',
@@ -87,3 +96,18 @@ if CONFIG['MOZ_DEBUG']:
 elif not CONFIG['RELEASE_OR_BETA']:
     # Enable fast assertions in opt builds of Nightly and Aurora.
     DEFINES['ASSERT_LEVEL'] = 1
+
+# clang-cl's <intrin.h> doesn't work the same as MSVC's.  For details, see:
+#
+# http://lists.llvm.org/pipermail/cfe-dev/2016-September/050943.html
+#
+# As a temporary workaround while upstream decides how to address this,
+# we enable modules to make <intrin.h> more MSVC-compatible.
+if CONFIG['CLANG_CL']:
+    CFLAGS += [
+        '-Xclang',
+        '-fmodules',
+        '-Xclang',
+        '-fmodules-cache-path=' + TOPOBJDIR + '/media/ffpvx',
+        '-fbuiltin-module-map',
+    ]