diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
| commit | 878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch) | |
| tree | 3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /dom/media/platforms/ffmpeg/ffvpx/moz.build | |
| parent | a621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff) | |
| parent | cfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff) | |
| download | aura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz | |
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'dom/media/platforms/ffmpeg/ffvpx/moz.build')
| -rw-r--r-- | dom/media/platforms/ffmpeg/ffvpx/moz.build | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build index c060efbd7..073d769f8 100644 --- a/dom/media/platforms/ffmpeg/ffvpx/moz.build +++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build @@ -22,13 +22,11 @@ LOCAL_INCLUDES += [ '../ffmpeg58/include', ] -if CONFIG['OS_ARCH'] == 'WINNT': - LOCAL_INCLUDES += [ - '../ffmpeg57/include', - ] - if CONFIG['GNU_CXX']: - CXXFLAGS += [ '-Wno-deprecated-declarations' ] + CXXFLAGS += [ + '-Wno-attributes', + '-Wno-deprecated-declarations', + ] if CONFIG['CLANG_CXX']: CXXFLAGS += [ '-Wno-unknown-attributes', |