From 8b37a1bc306c1d5a3cc92e9dc04fb95d5d9a0298 Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 26 Apr 2018 16:49:15 -0500 Subject: [ffvpx] Update ffvp9/ffvp8 to 3.4.2-release Structure of code was slightly modified so that it should be no longer necessary to re-generate the config_*.h files, greatly simplifying the resync process in the future. --- media/ffvpx/ffvpxcommon.mozbuild | 3 +++ 1 file changed, 3 insertions(+) (limited to 'media/ffvpx/ffvpxcommon.mozbuild') diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/media/ffvpx/ffvpxcommon.mozbuild index 6d17e8807..a8bb19e56 100644 --- a/media/ffvpx/ffvpxcommon.mozbuild +++ b/media/ffvpx/ffvpxcommon.mozbuild @@ -29,6 +29,8 @@ if CONFIG['FFVPX_ASFLAGS']: else: # Default to unix, similar to how ASFLAGS setup works in configure.in ASFLAGS += ['-Pconfig_unix64.asm'] + # default disabled components + ASFLAGS += ['-Pdefaults_disabled.asm'] LOCAL_INCLUDES += ['/media/ffvpx'] @@ -87,6 +89,7 @@ elif CONFIG['_MSC_VER']: '-wd4057', '-wd4204', '-wd4706', '-wd4305', '-wd4152', '-wd4324', '-we4013', '-wd4100', '-wd4214', '-wd4307', '-wd4273', '-wd4554', ] + LOCAL_INCLUDES += ['/media/ffvpx/compat/atomics/win32'] DEFINES['HAVE_AV_CONFIG_H'] = True -- cgit v1.2.3