Issue %3003 - Move ffvpx to libs/

308 files changed, 12 insertions, 22 deletions

diff --git a/config/external/moz.build b/config/external/moz.build
index 7cd201a07..097f80dde 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -3,11 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-external_dirs = []
-
 DIRS += ['lgpllibs']
-
-if CONFIG['MOZ_FFVPX']:
-    external_dirs += ['media/ffvpx']
-
-DIRS += ['../../' + i for i in external_dirs]
diff --git a/media/ffvpx/COPYING.LGPLv2.1 b/libs/ffvpx/COPYING.LGPLv2.1
index 58af0d378..58af0d378 100644
--- a/media/ffvpx/COPYING.LGPLv2.1
+++ b/libs/ffvpx/COPYING.LGPLv2.1
diff --git a/media/ffvpx/COPYING.LGPLv3 b/libs/ffvpx/COPYING.LGPLv3
index 65c5ca88a..65c5ca88a 100644
--- a/media/ffvpx/COPYING.LGPLv3
+++ b/libs/ffvpx/COPYING.LGPLv3
diff --git a/media/ffvpx/FILES b/libs/ffvpx/FILES
index a9eb97710..a9eb97710 100644
--- a/media/ffvpx/FILES
+++ b/libs/ffvpx/FILES
diff --git a/media/ffvpx/README_MCP b/libs/ffvpx/README_MCP
index 26834d3e3..d4537886b 100644
--- a/media/ffvpx/README_MCP
+++ b/libs/ffvpx/README_MCP
@@ -24,8 +24,8 @@ config_win32/64.h/asm:
 add to configure command: --toolchain=msvc
 
 Regenerate defaults_disabled.{h,asm} with:
-$ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.h | sort -u > ~/REPO/UXP/media/ffvpx/defaults_disabled.h
-$ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.asm | sort -u > ~/REPO/UXP/media/ffvpx/defaults_disabled.asm
+$ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.h | sort -u > ~/REPO/GRE/libs/ffvpx/defaults_disabled.h
+$ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.asm | sort -u > ~/REPO/GRE/libs/ffvpx/defaults_disabled.asm
 
 All new decoders/muxers/encoders/... should be added in the list of dummy functions found in libavcodec/dummy_funcs.c
 otherwise linkage will fail on Windows. On other platforms they are optimised out and aren't necessary.
@@ -35,7 +35,7 @@ To update the source tree, perform a diff on the files listed in FILES.
 The diffs should typically apply to the ffvpx tree.
 e.g. something like this would do:
 Run in the ffmpeg original tree:
-$ for i in `cat $PATH_CENTRAL/media/ffvpx/FILES`; do git diff $REV_LASTSYNC HEAD >> patch.diff; done
+$ for i in `cat $PATH_CENTRAL/libs/ffvpx/FILES`; do git diff $REV_LASTSYNC HEAD >> patch.diff; done
 Then apply patch.diff on the ffvpx tree.
 
 Compilation will reveal if any files are missing.
diff --git a/media/ffvpx/changes.patch b/libs/ffvpx/changes.patch
index 49a49b26b..49a49b26b 100644
--- a/media/ffvpx/changes.patch
+++ b/libs/ffvpx/changes.patch
diff --git a/media/ffvpx/compat/atomics/win32/stdatomic.h b/libs/ffvpx/compat/atomics/win32/stdatomic.h
index bb8e6e7e1..bb8e6e7e1 100644
--- a/media/ffvpx/compat/atomics/win32/stdatomic.h
+++ b/libs/ffvpx/compat/atomics/win32/stdatomic.h
diff --git a/media/ffvpx/compat/va_copy.h b/libs/ffvpx/compat/va_copy.h
index a40bbe663..a40bbe663 100644
--- a/media/ffvpx/compat/va_copy.h
+++ b/libs/ffvpx/compat/va_copy.h
diff --git a/media/ffvpx/compat/w32pthreads.h b/libs/ffvpx/compat/w32pthreads.h
index 21acfd2ba..21acfd2ba 100644
--- a/media/ffvpx/compat/w32pthreads.h
+++ b/libs/ffvpx/compat/w32pthreads.h
diff --git a/media/ffvpx/config.h b/libs/ffvpx/config.h
index f43da8f28..f43da8f28 100644
--- a/media/ffvpx/config.h
+++ b/libs/ffvpx/config.h
diff --git a/media/ffvpx/config_common.h b/libs/ffvpx/config_common.h
index dd3b3e170..dd3b3e170 100644
--- a/media/ffvpx/config_common.h
+++ b/libs/ffvpx/config_common.h
diff --git a/media/ffvpx/config_unix32.h b/libs/ffvpx/config_unix32.h
index 172205963..172205963 100644
--- a/media/ffvpx/config_unix32.h
+++ b/libs/ffvpx/config_unix32.h
diff --git a/media/ffvpx/config_unix64.asm b/libs/ffvpx/config_unix64.asm
index 574207b1d..574207b1d 100644
--- a/media/ffvpx/config_unix64.asm
+++ b/libs/ffvpx/config_unix64.asm
diff --git a/media/ffvpx/config_unix64.h b/libs/ffvpx/config_unix64.h
index 338b6692f..338b6692f 100644
--- a/media/ffvpx/config_unix64.h
+++ b/libs/ffvpx/config_unix64.h
diff --git a/media/ffvpx/config_win32.asm b/libs/ffvpx/config_win32.asm
index 3a3566d6f..3a3566d6f 100644
--- a/media/ffvpx/config_win32.asm
+++ b/libs/ffvpx/config_win32.asm
diff --git a/media/ffvpx/config_win32.h b/libs/ffvpx/config_win32.h
index 35480e418..35480e418 100644
--- a/media/ffvpx/config_win32.h
+++ b/libs/ffvpx/config_win32.h
diff --git a/media/ffvpx/config_win64.asm b/libs/ffvpx/config_win64.asm
index fecfee498..fecfee498 100644
--- a/media/ffvpx/config_win64.asm
+++ b/libs/ffvpx/config_win64.asm
diff --git a/media/ffvpx/config_win64.h b/libs/ffvpx/config_win64.h
index cd8f991d8..cd8f991d8 100644
--- a/media/ffvpx/config_win64.h
+++ b/libs/ffvpx/config_win64.h
diff --git a/media/ffvpx/defaults_disabled.asm b/libs/ffvpx/defaults_disabled.asm
index 220a11f3d..220a11f3d 100644
--- a/media/ffvpx/defaults_disabled.asm
+++ b/libs/ffvpx/defaults_disabled.asm
diff --git a/media/ffvpx/defaults_disabled.h b/libs/ffvpx/defaults_disabled.h
index 7f5e23b96..7f5e23b96 100644
--- a/media/ffvpx/defaults_disabled.h
+++ b/libs/ffvpx/defaults_disabled.h
diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/libs/ffvpx/ffvpxcommon.mozbuild
index 2481dc84e..0b55d77e9 100644
--- a/media/ffvpx/ffvpxcommon.mozbuild
+++ b/libs/ffvpx/ffvpxcommon.mozbuild
@@ -5,7 +5,7 @@
 
 # Add assembler flags and includes
 ASFLAGS += CONFIG['FFVPX_ASFLAGS']
-ASFLAGS += ['-I%s/media/ffvpx' % TOPSRCDIR]
+ASFLAGS += ['-I%s/libs/ffvpx' % TOPSRCDIR]
 
 if CONFIG['FFVPX_ASFLAGS']:
     USE_YASM = True
@@ -19,19 +19,13 @@ if CONFIG['FFVPX_ASFLAGS']:
             ASFLAGS += ['-Pconfig_win32.asm']
         else:
             ASFLAGS += ['-Pconfig_win64.asm']
-    elif CONFIG['OS_ARCH'] == 'Darwin':
-        # 64-bit macosx assemblers need to prefix symbols with an underscore.
-        ASFLAGS += [
-            '-Pconfig_darwin64.asm',
-            '-DPREFIX'
-        ]
     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']
+LOCAL_INCLUDES += ['/libs/ffvpx']
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
@@ -90,7 +84,7 @@ elif CONFIG['_MSC_VER']:
         '-wd4057', '-wd4204', '-wd4706', '-wd4305', '-wd4152', '-wd4324',
         '-we4013', '-wd4100', '-wd4214', '-wd4307', '-wd4273', '-wd4554',
     ]
-    LOCAL_INCLUDES += ['/media/ffvpx/compat/atomics/win32']
+    LOCAL_INCLUDES += ['/libs/ffvpx/compat/atomics/win32']
 
 DEFINES['HAVE_AV_CONFIG_H'] = True
 
@@ -112,6 +106,6 @@ if CONFIG['CLANG_CL']:
         '-Xclang',
         '-fmodules',
         '-Xclang',
-        '-fmodules-cache-path=' + TOPOBJDIR + '/media/ffpvx',
+        '-fmodules-cache-path=' + TOPOBJDIR + '/libs/ffpvx',
         '-fbuiltin-module-map',
     ]
diff --git a/media/ffvpx/libavcodec/allcodecs.c b/libs/ffvpx/libavcodec/allcodecs.c
index 4d4ef530e..4d4ef530e 100644
--- a/media/ffvpx/libavcodec/allcodecs.c
+++ b/libs/ffvpx/libavcodec/allcodecs.c
diff --git a/media/ffvpx/libavcodec/avcodec.h b/libs/ffvpx/libavcodec/avcodec.h
index fb0c6fae7..fb0c6fae7 100644
--- a/media/ffvpx/libavcodec/avcodec.h
+++ b/libs/ffvpx/libavcodec/avcodec.h
diff --git a/media/ffvpx/libavcodec/avcodec.symbols b/libs/ffvpx/libavcodec/avcodec.symbols
index 8f135e523..8f135e523 100644
--- a/media/ffvpx/libavcodec/avcodec.symbols
+++ b/libs/ffvpx/libavcodec/avcodec.symbols
diff --git a/media/ffvpx/libavcodec/avpacket.c b/libs/ffvpx/libavcodec/avpacket.c
index 99a0c1383..99a0c1383 100644
--- a/media/ffvpx/libavcodec/avpacket.c
+++ b/libs/ffvpx/libavcodec/avpacket.c
diff --git a/media/ffvpx/libavcodec/avpicture.c b/libs/ffvpx/libavcodec/avpicture.c
index 56435f4fc..56435f4fc 100644
--- a/media/ffvpx/libavcodec/avpicture.c
+++ b/libs/ffvpx/libavcodec/avpicture.c
diff --git a/media/ffvpx/libavcodec/bit_depth_template.c b/libs/ffvpx/libavcodec/bit_depth_template.c
index d44d47ea4..d44d47ea4 100644
--- a/media/ffvpx/libavcodec/bit_depth_template.c
+++ b/libs/ffvpx/libavcodec/bit_depth_template.c
diff --git a/media/ffvpx/libavcodec/bitstream.c b/libs/ffvpx/libavcodec/bitstream.c
index ed528fe4a..ed528fe4a 100644
--- a/media/ffvpx/libavcodec/bitstream.c
+++ b/libs/ffvpx/libavcodec/bitstream.c
diff --git a/media/ffvpx/libavcodec/bitstream_filter.c b/libs/ffvpx/libavcodec/bitstream_filter.c
index ca11ed371..ca11ed371 100644
--- a/media/ffvpx/libavcodec/bitstream_filter.c
+++ b/libs/ffvpx/libavcodec/bitstream_filter.c
diff --git a/media/ffvpx/libavcodec/bitstream_filters.c b/libs/ffvpx/libavcodec/bitstream_filters.c
index 18b698a85..18b698a85 100644
--- a/media/ffvpx/libavcodec/bitstream_filters.c
+++ b/libs/ffvpx/libavcodec/bitstream_filters.c
diff --git a/media/ffvpx/libavcodec/blockdsp.h b/libs/ffvpx/libavcodec/blockdsp.h
index 26fc2ea13..26fc2ea13 100644
--- a/media/ffvpx/libavcodec/blockdsp.h
+++ b/libs/ffvpx/libavcodec/blockdsp.h
diff --git a/media/ffvpx/libavcodec/bsf.c b/libs/ffvpx/libavcodec/bsf.c
index bd611ea16..bd611ea16 100644
--- a/media/ffvpx/libavcodec/bsf.c
+++ b/libs/ffvpx/libavcodec/bsf.c
diff --git a/media/ffvpx/libavcodec/bsf.h b/libs/ffvpx/libavcodec/bsf.h
index af035eee4..af035eee4 100644
--- a/media/ffvpx/libavcodec/bsf.h
+++ b/libs/ffvpx/libavcodec/bsf.h
diff --git a/media/ffvpx/libavcodec/bsf_list.c b/libs/ffvpx/libavcodec/bsf_list.c
index 92d9948b2..92d9948b2 100644
--- a/media/ffvpx/libavcodec/bsf_list.c
+++ b/libs/ffvpx/libavcodec/bsf_list.c
diff --git a/media/ffvpx/libavcodec/bytestream.h b/libs/ffvpx/libavcodec/bytestream.h
index 7be7fc22f..7be7fc22f 100644
--- a/media/ffvpx/libavcodec/bytestream.h
+++ b/libs/ffvpx/libavcodec/bytestream.h
diff --git a/media/ffvpx/libavcodec/codec_desc.c b/libs/ffvpx/libavcodec/codec_desc.c
index 79552a910..79552a910 100644
--- a/media/ffvpx/libavcodec/codec_desc.c
+++ b/libs/ffvpx/libavcodec/codec_desc.c
diff --git a/media/ffvpx/libavcodec/codec_list.c b/libs/ffvpx/libavcodec/codec_list.c
index 063f8ff78..063f8ff78 100644
--- a/media/ffvpx/libavcodec/codec_list.c
+++ b/libs/ffvpx/libavcodec/codec_list.c
diff --git a/media/ffvpx/libavcodec/decode.c b/libs/ffvpx/libavcodec/decode.c
index 421a8f1a3..421a8f1a3 100644
--- a/media/ffvpx/libavcodec/decode.c
+++ b/libs/ffvpx/libavcodec/decode.c
diff --git a/media/ffvpx/libavcodec/decode.h b/libs/ffvpx/libavcodec/decode.h
index 15271c529..15271c529 100644
--- a/media/ffvpx/libavcodec/decode.h
+++ b/libs/ffvpx/libavcodec/decode.h
diff --git a/media/ffvpx/libavcodec/dummy_funcs.c b/libs/ffvpx/libavcodec/dummy_funcs.c
index 295ee84e1..295ee84e1 100644
--- a/media/ffvpx/libavcodec/dummy_funcs.c
+++ b/libs/ffvpx/libavcodec/dummy_funcs.c
diff --git a/media/ffvpx/libavcodec/error_resilience.h b/libs/ffvpx/libavcodec/error_resilience.h
index 664a76565..664a76565 100644
--- a/media/ffvpx/libavcodec/error_resilience.h
+++ b/libs/ffvpx/libavcodec/error_resilience.h
diff --git a/media/ffvpx/libavcodec/fdctdsp.h b/libs/ffvpx/libavcodec/fdctdsp.h
index 3e1f683b9..3e1f683b9 100644
--- a/media/ffvpx/libavcodec/fdctdsp.h
+++ b/libs/ffvpx/libavcodec/fdctdsp.h
diff --git a/media/ffvpx/libavcodec/flac.c b/libs/ffvpx/libavcodec/flac.c
index 5ffbf9319..5ffbf9319 100644
--- a/media/ffvpx/libavcodec/flac.c
+++ b/libs/ffvpx/libavcodec/flac.c
diff --git a/media/ffvpx/libavcodec/flac.h b/libs/ffvpx/libavcodec/flac.h
index 991ab43f3..991ab43f3 100644
--- a/media/ffvpx/libavcodec/flac.h
+++ b/libs/ffvpx/libavcodec/flac.h
diff --git a/media/ffvpx/libavcodec/flac_parser.c b/libs/ffvpx/libavcodec/flac_parser.c
index 272128646..272128646 100644
--- a/media/ffvpx/libavcodec/flac_parser.c
+++ b/libs/ffvpx/libavcodec/flac_parser.c
diff --git a/media/ffvpx/libavcodec/flacdata.c b/libs/ffvpx/libavcodec/flacdata.c
index 1954f32d3..1954f32d3 100644
--- a/media/ffvpx/libavcodec/flacdata.c
+++ b/libs/ffvpx/libavcodec/flacdata.c
diff --git a/media/ffvpx/libavcodec/flacdata.h b/libs/ffvpx/libavcodec/flacdata.h
index e2c1e5d7f..e2c1e5d7f 100644
--- a/media/ffvpx/libavcodec/flacdata.h
+++ b/libs/ffvpx/libavcodec/flacdata.h
diff --git a/media/ffvpx/libavcodec/flacdec.c b/libs/ffvpx/libavcodec/flacdec.c
index c8eb45604..c8eb45604 100644
--- a/media/ffvpx/libavcodec/flacdec.c
+++ b/libs/ffvpx/libavcodec/flacdec.c
diff --git a/media/ffvpx/libavcodec/flacdsp.c b/libs/ffvpx/libavcodec/flacdsp.c
index bc9a5dbed..bc9a5dbed 100644
--- a/media/ffvpx/libavcodec/flacdsp.c
+++ b/libs/ffvpx/libavcodec/flacdsp.c
diff --git a/media/ffvpx/libavcodec/flacdsp.h b/libs/ffvpx/libavcodec/flacdsp.h
index 7bb0dd0e9..7bb0dd0e9 100644
--- a/media/ffvpx/libavcodec/flacdsp.h
+++ b/libs/ffvpx/libavcodec/flacdsp.h
diff --git a/media/ffvpx/libavcodec/flacdsp_lpc_template.c b/libs/ffvpx/libavcodec/flacdsp_lpc_template.c
index 5d532e067..5d532e067 100644
--- a/media/ffvpx/libavcodec/flacdsp_lpc_template.c
+++ b/libs/ffvpx/libavcodec/flacdsp_lpc_template.c
diff --git a/media/ffvpx/libavcodec/flacdsp_template.c b/libs/ffvpx/libavcodec/flacdsp_template.c
index 776c78da7..776c78da7 100644
--- a/media/ffvpx/libavcodec/flacdsp_template.c
+++ b/libs/ffvpx/libavcodec/flacdsp_template.c
diff --git a/media/ffvpx/libavcodec/frame_thread_encoder.h b/libs/ffvpx/libavcodec/frame_thread_encoder.h
index 1f79553f2..1f79553f2 100644
--- a/media/ffvpx/libavcodec/frame_thread_encoder.h
+++ b/libs/ffvpx/libavcodec/frame_thread_encoder.h
diff --git a/media/ffvpx/libavcodec/get_bits.h b/libs/ffvpx/libavcodec/get_bits.h
index 56ef5f0cb..56ef5f0cb 100644
--- a/media/ffvpx/libavcodec/get_bits.h
+++ b/libs/ffvpx/libavcodec/get_bits.h
diff --git a/media/ffvpx/libavcodec/golomb.c b/libs/ffvpx/libavcodec/golomb.c
index 937ac22ce..937ac22ce 100644
--- a/media/ffvpx/libavcodec/golomb.c
+++ b/libs/ffvpx/libavcodec/golomb.c
diff --git a/media/ffvpx/libavcodec/golomb.h b/libs/ffvpx/libavcodec/golomb.h
index efb1eff8a..efb1eff8a 100644
--- a/media/ffvpx/libavcodec/golomb.h
+++ b/libs/ffvpx/libavcodec/golomb.h
diff --git a/media/ffvpx/libavcodec/h263dsp.h b/libs/ffvpx/libavcodec/h263dsp.h
index 1abea3ca8..1abea3ca8 100644
--- a/media/ffvpx/libavcodec/h263dsp.h
+++ b/libs/ffvpx/libavcodec/h263dsp.h
diff --git a/media/ffvpx/libavcodec/h264chroma.h b/libs/ffvpx/libavcodec/h264chroma.h
index 5c89fd12d..5c89fd12d 100644
--- a/media/ffvpx/libavcodec/h264chroma.h
+++ b/libs/ffvpx/libavcodec/h264chroma.h
diff --git a/media/ffvpx/libavcodec/h264dsp.h b/libs/ffvpx/libavcodec/h264dsp.h
index bcd76abcc..bcd76abcc 100644
--- a/media/ffvpx/libavcodec/h264dsp.h
+++ b/libs/ffvpx/libavcodec/h264dsp.h
diff --git a/media/ffvpx/libavcodec/h264pred.c b/libs/ffvpx/libavcodec/h264pred.c
index 5632a58fd..5632a58fd 100644
--- a/media/ffvpx/libavcodec/h264pred.c
+++ b/libs/ffvpx/libavcodec/h264pred.c
diff --git a/media/ffvpx/libavcodec/h264pred.h b/libs/ffvpx/libavcodec/h264pred.h
index 2863dc9bd..2863dc9bd 100644
--- a/media/ffvpx/libavcodec/h264pred.h
+++ b/libs/ffvpx/libavcodec/h264pred.h
diff --git a/media/ffvpx/libavcodec/h264pred_template.c b/libs/ffvpx/libavcodec/h264pred_template.c
index 2b30fff70..2b30fff70 100644
--- a/media/ffvpx/libavcodec/h264pred_template.c
+++ b/libs/ffvpx/libavcodec/h264pred_template.c
diff --git a/media/ffvpx/libavcodec/hpeldsp.h b/libs/ffvpx/libavcodec/hpeldsp.h
index 768139bfc..768139bfc 100644
--- a/media/ffvpx/libavcodec/hpeldsp.h
+++ b/libs/ffvpx/libavcodec/hpeldsp.h
diff --git a/media/ffvpx/libavcodec/hwaccel.h b/libs/ffvpx/libavcodec/hwaccel.h
index 3aaa92571..3aaa92571 100644
--- a/media/ffvpx/libavcodec/hwaccel.h
+++ b/libs/ffvpx/libavcodec/hwaccel.h
diff --git a/media/ffvpx/libavcodec/hwaccels.h b/libs/ffvpx/libavcodec/hwaccels.h
index 7d73da867..7d73da867 100644
--- a/media/ffvpx/libavcodec/hwaccels.h
+++ b/libs/ffvpx/libavcodec/hwaccels.h
diff --git a/media/ffvpx/libavcodec/idctdsp.h b/libs/ffvpx/libavcodec/idctdsp.h
index ca21a31a0..ca21a31a0 100644
--- a/media/ffvpx/libavcodec/idctdsp.h
+++ b/libs/ffvpx/libavcodec/idctdsp.h
diff --git a/media/ffvpx/libavcodec/imgconvert.c b/libs/ffvpx/libavcodec/imgconvert.c
index 1fd636c83..1fd636c83 100644
--- a/media/ffvpx/libavcodec/imgconvert.c
+++ b/libs/ffvpx/libavcodec/imgconvert.c
diff --git a/media/ffvpx/libavcodec/internal.h b/libs/ffvpx/libavcodec/internal.h
index bb92873d7..bb92873d7 100644
--- a/media/ffvpx/libavcodec/internal.h
+++ b/libs/ffvpx/libavcodec/internal.h
diff --git a/media/ffvpx/libavcodec/log2_tab.c b/libs/ffvpx/libavcodec/log2_tab.c
index 47a1df03b..47a1df03b 100644
--- a/media/ffvpx/libavcodec/log2_tab.c
+++ b/libs/ffvpx/libavcodec/log2_tab.c
diff --git a/media/ffvpx/libavcodec/mathops.h b/libs/ffvpx/libavcodec/mathops.h
index 1c3566431..1c3566431 100644
--- a/media/ffvpx/libavcodec/mathops.h
+++ b/libs/ffvpx/libavcodec/mathops.h
diff --git a/media/ffvpx/libavcodec/mathtables.c b/libs/ffvpx/libavcodec/mathtables.c
index 81eabc7a6..81eabc7a6 100644
--- a/media/ffvpx/libavcodec/mathtables.c
+++ b/libs/ffvpx/libavcodec/mathtables.c
diff --git a/media/ffvpx/libavcodec/me_cmp.h b/libs/ffvpx/libavcodec/me_cmp.h
index 0a589e3c3..0a589e3c3 100644
--- a/media/ffvpx/libavcodec/me_cmp.h
+++ b/libs/ffvpx/libavcodec/me_cmp.h
diff --git a/media/ffvpx/libavcodec/motion_est.h b/libs/ffvpx/libavcodec/motion_est.h
index 3b3a8d734..3b3a8d734 100644
--- a/media/ffvpx/libavcodec/motion_est.h
+++ b/libs/ffvpx/libavcodec/motion_est.h
diff --git a/media/ffvpx/libavcodec/moz.build b/libs/ffvpx/libavcodec/moz.build
index 0dbabcf75..0dbabcf75 100644
--- a/media/ffvpx/libavcodec/moz.build
+++ b/libs/ffvpx/libavcodec/moz.build
diff --git a/media/ffvpx/libavcodec/mpeg12data.h b/libs/ffvpx/libavcodec/mpeg12data.h
index f51faf460..f51faf460 100644
--- a/media/ffvpx/libavcodec/mpeg12data.h
+++ b/libs/ffvpx/libavcodec/mpeg12data.h
diff --git a/media/ffvpx/libavcodec/mpegpicture.h b/libs/ffvpx/libavcodec/mpegpicture.h
index 2db3d6733..2db3d6733 100644
--- a/media/ffvpx/libavcodec/mpegpicture.h
+++ b/libs/ffvpx/libavcodec/mpegpicture.h
diff --git a/media/ffvpx/libavcodec/mpegutils.h b/libs/ffvpx/libavcodec/mpegutils.h
index 1ed21c19b..1ed21c19b 100644
--- a/media/ffvpx/libavcodec/mpegutils.h
+++ b/libs/ffvpx/libavcodec/mpegutils.h
diff --git a/media/ffvpx/libavcodec/mpegvideo.h b/libs/ffvpx/libavcodec/mpegvideo.h
index 541909cbb..541909cbb 100644
--- a/media/ffvpx/libavcodec/mpegvideo.h
+++ b/libs/ffvpx/libavcodec/mpegvideo.h
diff --git a/media/ffvpx/libavcodec/mpegvideodata.h b/libs/ffvpx/libavcodec/mpegvideodata.h
index 14f4806d6..14f4806d6 100644
--- a/media/ffvpx/libavcodec/mpegvideodata.h
+++ b/libs/ffvpx/libavcodec/mpegvideodata.h
diff --git a/media/ffvpx/libavcodec/mpegvideodsp.h b/libs/ffvpx/libavcodec/mpegvideodsp.h
index 293e2548d..293e2548d 100644
--- a/media/ffvpx/libavcodec/mpegvideodsp.h
+++ b/libs/ffvpx/libavcodec/mpegvideodsp.h
diff --git a/media/ffvpx/libavcodec/mpegvideoencdsp.h b/libs/ffvpx/libavcodec/mpegvideoencdsp.h
index 33f0282fc..33f0282fc 100644
--- a/media/ffvpx/libavcodec/mpegvideoencdsp.h
+++ b/libs/ffvpx/libavcodec/mpegvideoencdsp.h
diff --git a/media/ffvpx/libavcodec/null_bsf.c b/libs/ffvpx/libavcodec/null_bsf.c
index 24d26dfb1..24d26dfb1 100644
--- a/media/ffvpx/libavcodec/null_bsf.c
+++ b/libs/ffvpx/libavcodec/null_bsf.c
diff --git a/media/ffvpx/libavcodec/options.c b/libs/ffvpx/libavcodec/options.c
index 41b60521c..41b60521c 100644
--- a/media/ffvpx/libavcodec/options.c
+++ b/libs/ffvpx/libavcodec/options.c
diff --git a/media/ffvpx/libavcodec/options_table.h b/libs/ffvpx/libavcodec/options_table.h
index 099261e16..099261e16 100644
--- a/media/ffvpx/libavcodec/options_table.h
+++ b/libs/ffvpx/libavcodec/options_table.h
diff --git a/media/ffvpx/libavcodec/parser.c b/libs/ffvpx/libavcodec/parser.c
index f43b197d5..f43b197d5 100644
--- a/media/ffvpx/libavcodec/parser.c
+++ b/libs/ffvpx/libavcodec/parser.c
diff --git a/media/ffvpx/libavcodec/parser.h b/libs/ffvpx/libavcodec/parser.h
index ef35547e9..ef35547e9 100644
--- a/media/ffvpx/libavcodec/parser.h
+++ b/libs/ffvpx/libavcodec/parser.h
diff --git a/media/ffvpx/libavcodec/parser_list.c b/libs/ffvpx/libavcodec/parser_list.c
index b60c60bce..b60c60bce 100644
--- a/media/ffvpx/libavcodec/parser_list.c
+++ b/libs/ffvpx/libavcodec/parser_list.c
diff --git a/media/ffvpx/libavcodec/pixblockdsp.h b/libs/ffvpx/libavcodec/pixblockdsp.h
index e036700ff..e036700ff 100644
--- a/media/ffvpx/libavcodec/pixblockdsp.h
+++ b/libs/ffvpx/libavcodec/pixblockdsp.h
diff --git a/media/ffvpx/libavcodec/profiles.c b/libs/ffvpx/libavcodec/profiles.c
index d7dc960f3..d7dc960f3 100644
--- a/media/ffvpx/libavcodec/profiles.c
+++ b/libs/ffvpx/libavcodec/profiles.c
diff --git a/media/ffvpx/libavcodec/profiles.h b/libs/ffvpx/libavcodec/profiles.h
index 9d7e211e1..9d7e211e1 100644
--- a/media/ffvpx/libavcodec/profiles.h
+++ b/libs/ffvpx/libavcodec/profiles.h
diff --git a/media/ffvpx/libavcodec/pthread.c b/libs/ffvpx/libavcodec/pthread.c
index 572471586..572471586 100644
--- a/media/ffvpx/libavcodec/pthread.c
+++ b/libs/ffvpx/libavcodec/pthread.c
diff --git a/media/ffvpx/libavcodec/pthread_frame.c b/libs/ffvpx/libavcodec/pthread_frame.c
index 5104b1beb..5104b1beb 100644
--- a/media/ffvpx/libavcodec/pthread_frame.c
+++ b/libs/ffvpx/libavcodec/pthread_frame.c
diff --git a/media/ffvpx/libavcodec/pthread_internal.h b/libs/ffvpx/libavcodec/pthread_internal.h
index d2115cbba..d2115cbba 100644
--- a/media/ffvpx/libavcodec/pthread_internal.h
+++ b/libs/ffvpx/libavcodec/pthread_internal.h
diff --git a/media/ffvpx/libavcodec/pthread_slice.c b/libs/ffvpx/libavcodec/pthread_slice.c
index 77cfe3c9f..77cfe3c9f 100644
--- a/media/ffvpx/libavcodec/pthread_slice.c
+++ b/libs/ffvpx/libavcodec/pthread_slice.c
diff --git a/media/ffvpx/libavcodec/put_bits.h b/libs/ffvpx/libavcodec/put_bits.h
index 1ceb1cc76..1ceb1cc76 100644
--- a/media/ffvpx/libavcodec/put_bits.h
+++ b/libs/ffvpx/libavcodec/put_bits.h
diff --git a/media/ffvpx/libavcodec/qpeldsp.h b/libs/ffvpx/libavcodec/qpeldsp.h
index 91019eda9..91019eda9 100644
--- a/media/ffvpx/libavcodec/qpeldsp.h
+++ b/libs/ffvpx/libavcodec/qpeldsp.h
diff --git a/media/ffvpx/libavcodec/qsv_api.c b/libs/ffvpx/libavcodec/qsv_api.c
index 327ff7d81..327ff7d81 100644
--- a/media/ffvpx/libavcodec/qsv_api.c
+++ b/libs/ffvpx/libavcodec/qsv_api.c
diff --git a/media/ffvpx/libavcodec/ratecontrol.h b/libs/ffvpx/libavcodec/ratecontrol.h
index 2a7aaec64..2a7aaec64 100644
--- a/media/ffvpx/libavcodec/ratecontrol.h
+++ b/libs/ffvpx/libavcodec/ratecontrol.h
diff --git a/media/ffvpx/libavcodec/raw.c b/libs/ffvpx/libavcodec/raw.c
index 8da2a9735..8da2a9735 100644
--- a/media/ffvpx/libavcodec/raw.c
+++ b/libs/ffvpx/libavcodec/raw.c
diff --git a/media/ffvpx/libavcodec/raw.h b/libs/ffvpx/libavcodec/raw.h
index 28a27b1f9..28a27b1f9 100644
--- a/media/ffvpx/libavcodec/raw.h
+++ b/libs/ffvpx/libavcodec/raw.h
diff --git a/media/ffvpx/libavcodec/rectangle.h b/libs/ffvpx/libavcodec/rectangle.h
index df7c18a4e..df7c18a4e 100644
--- a/media/ffvpx/libavcodec/rectangle.h
+++ b/libs/ffvpx/libavcodec/rectangle.h
diff --git a/media/ffvpx/libavcodec/reverse.c b/libs/ffvpx/libavcodec/reverse.c
index 440badaf3..440badaf3 100644
--- a/media/ffvpx/libavcodec/reverse.c
+++ b/libs/ffvpx/libavcodec/reverse.c
diff --git a/media/ffvpx/libavcodec/rl.h b/libs/ffvpx/libavcodec/rl.h
index 9a767bc5f..9a767bc5f 100644
--- a/media/ffvpx/libavcodec/rl.h
+++ b/libs/ffvpx/libavcodec/rl.h
diff --git a/media/ffvpx/libavcodec/rnd_avg.h b/libs/ffvpx/libavcodec/rnd_avg.h
index 344775e31..344775e31 100644
--- a/media/ffvpx/libavcodec/rnd_avg.h
+++ b/libs/ffvpx/libavcodec/rnd_avg.h
diff --git a/media/ffvpx/libavcodec/thread.h b/libs/ffvpx/libavcodec/thread.h
index 540135fbc..540135fbc 100644
--- a/media/ffvpx/libavcodec/thread.h
+++ b/libs/ffvpx/libavcodec/thread.h
diff --git a/media/ffvpx/libavcodec/unary.h b/libs/ffvpx/libavcodec/unary.h
index 908dc9350..908dc9350 100644
--- a/media/ffvpx/libavcodec/unary.h
+++ b/libs/ffvpx/libavcodec/unary.h
diff --git a/media/ffvpx/libavcodec/utils.c b/libs/ffvpx/libavcodec/utils.c
index 59d41ccbb..59d41ccbb 100644
--- a/media/ffvpx/libavcodec/utils.c
+++ b/libs/ffvpx/libavcodec/utils.c
diff --git a/media/ffvpx/libavcodec/version.h b/libs/ffvpx/libavcodec/version.h
index 6895f1a46..6895f1a46 100644
--- a/media/ffvpx/libavcodec/version.h
+++ b/libs/ffvpx/libavcodec/version.h
diff --git a/media/ffvpx/libavcodec/videodsp.c b/libs/ffvpx/libavcodec/videodsp.c
index ce9e9eb14..ce9e9eb14 100644
--- a/media/ffvpx/libavcodec/videodsp.c
+++ b/libs/ffvpx/libavcodec/videodsp.c
diff --git a/media/ffvpx/libavcodec/videodsp.h b/libs/ffvpx/libavcodec/videodsp.h
index c0545f22b..c0545f22b 100644
--- a/media/ffvpx/libavcodec/videodsp.h
+++ b/libs/ffvpx/libavcodec/videodsp.h
diff --git a/media/ffvpx/libavcodec/videodsp_template.c b/libs/ffvpx/libavcodec/videodsp_template.c
index 94c1b7188..94c1b7188 100644
--- a/media/ffvpx/libavcodec/videodsp_template.c
+++ b/libs/ffvpx/libavcodec/videodsp_template.c
diff --git a/media/ffvpx/libavcodec/vlc.h b/libs/ffvpx/libavcodec/vlc.h
index 42ccddf3f..42ccddf3f 100644
--- a/media/ffvpx/libavcodec/vlc.h
+++ b/libs/ffvpx/libavcodec/vlc.h
diff --git a/media/ffvpx/libavcodec/vorbis_parser.c b/libs/ffvpx/libavcodec/vorbis_parser.c
index 0b2c97cde..0b2c97cde 100644
--- a/media/ffvpx/libavcodec/vorbis_parser.c
+++ b/libs/ffvpx/libavcodec/vorbis_parser.c
diff --git a/media/ffvpx/libavcodec/vorbis_parser.h b/libs/ffvpx/libavcodec/vorbis_parser.h
index 789932ac4..789932ac4 100644
--- a/media/ffvpx/libavcodec/vorbis_parser.h
+++ b/libs/ffvpx/libavcodec/vorbis_parser.h
diff --git a/media/ffvpx/libavcodec/vorbis_parser_internal.h b/libs/ffvpx/libavcodec/vorbis_parser_internal.h
index 691a84238..691a84238 100644
--- a/media/ffvpx/libavcodec/vorbis_parser_internal.h
+++ b/libs/ffvpx/libavcodec/vorbis_parser_internal.h
diff --git a/media/ffvpx/libavcodec/vp3dsp.h b/libs/ffvpx/libavcodec/vp3dsp.h
index 2fdad162c..2fdad162c 100644
--- a/media/ffvpx/libavcodec/vp3dsp.h
+++ b/libs/ffvpx/libavcodec/vp3dsp.h
diff --git a/media/ffvpx/libavcodec/vp56.h b/libs/ffvpx/libavcodec/vp56.h
index b8dda9e73..b8dda9e73 100644
--- a/media/ffvpx/libavcodec/vp56.h
+++ b/libs/ffvpx/libavcodec/vp56.h
diff --git a/media/ffvpx/libavcodec/vp56dsp.h b/libs/ffvpx/libavcodec/vp56dsp.h
index e35e232ea..e35e232ea 100644
--- a/media/ffvpx/libavcodec/vp56dsp.h
+++ b/libs/ffvpx/libavcodec/vp56dsp.h
diff --git a/media/ffvpx/libavcodec/vp56rac.c b/libs/ffvpx/libavcodec/vp56rac.c
index e70302bf8..e70302bf8 100644
--- a/media/ffvpx/libavcodec/vp56rac.c
+++ b/libs/ffvpx/libavcodec/vp56rac.c
diff --git a/media/ffvpx/libavcodec/vp8.c b/libs/ffvpx/libavcodec/vp8.c
index 62b9f8bc2..62b9f8bc2 100644
--- a/media/ffvpx/libavcodec/vp8.c
+++ b/libs/ffvpx/libavcodec/vp8.c
diff --git a/media/ffvpx/libavcodec/vp8.h b/libs/ffvpx/libavcodec/vp8.h
index 70d21e3c6..70d21e3c6 100644
--- a/media/ffvpx/libavcodec/vp8.h
+++ b/libs/ffvpx/libavcodec/vp8.h
diff --git a/media/ffvpx/libavcodec/vp8_parser.c b/libs/ffvpx/libavcodec/vp8_parser.c
index e2d91b271..e2d91b271 100644
--- a/media/ffvpx/libavcodec/vp8_parser.c
+++ b/libs/ffvpx/libavcodec/vp8_parser.c
diff --git a/media/ffvpx/libavcodec/vp8data.h b/libs/ffvpx/libavcodec/vp8data.h
index 5e6dea761..5e6dea761 100644
--- a/media/ffvpx/libavcodec/vp8data.h
+++ b/libs/ffvpx/libavcodec/vp8data.h
diff --git a/media/ffvpx/libavcodec/vp8dsp.c b/libs/ffvpx/libavcodec/vp8dsp.c
index fed5c67a9..fed5c67a9 100644
--- a/media/ffvpx/libavcodec/vp8dsp.c
+++ b/libs/ffvpx/libavcodec/vp8dsp.c
diff --git a/media/ffvpx/libavcodec/vp8dsp.h b/libs/ffvpx/libavcodec/vp8dsp.h
index eaae4aed6..eaae4aed6 100644
--- a/media/ffvpx/libavcodec/vp8dsp.h
+++ b/libs/ffvpx/libavcodec/vp8dsp.h
diff --git a/media/ffvpx/libavcodec/vp9.c b/libs/ffvpx/libavcodec/vp9.c
index b1178c9c0..b1178c9c0 100644
--- a/media/ffvpx/libavcodec/vp9.c
+++ b/libs/ffvpx/libavcodec/vp9.c
diff --git a/media/ffvpx/libavcodec/vp9.h b/libs/ffvpx/libavcodec/vp9.h
index c8d07ad98..c8d07ad98 100644
--- a/media/ffvpx/libavcodec/vp9.h
+++ b/libs/ffvpx/libavcodec/vp9.h
diff --git a/media/ffvpx/libavcodec/vp9_mc_template.c b/libs/ffvpx/libavcodec/vp9_mc_template.c
index 31e692f36..31e692f36 100644
--- a/media/ffvpx/libavcodec/vp9_mc_template.c
+++ b/libs/ffvpx/libavcodec/vp9_mc_template.c
diff --git a/media/ffvpx/libavcodec/vp9_parser.c b/libs/ffvpx/libavcodec/vp9_parser.c
index 9531f34a3..9531f34a3 100644
--- a/media/ffvpx/libavcodec/vp9_parser.c
+++ b/libs/ffvpx/libavcodec/vp9_parser.c
diff --git a/media/ffvpx/libavcodec/vp9_superframe_split_bsf.c b/libs/ffvpx/libavcodec/vp9_superframe_split_bsf.c
index 9c4aa33dc..9c4aa33dc 100644
--- a/media/ffvpx/libavcodec/vp9_superframe_split_bsf.c
+++ b/libs/ffvpx/libavcodec/vp9_superframe_split_bsf.c
diff --git a/media/ffvpx/libavcodec/vp9block.c b/libs/ffvpx/libavcodec/vp9block.c
index 1c3f7a722..1c3f7a722 100644
--- a/media/ffvpx/libavcodec/vp9block.c
+++ b/libs/ffvpx/libavcodec/vp9block.c
diff --git a/media/ffvpx/libavcodec/vp9data.c b/libs/ffvpx/libavcodec/vp9data.c
index 7af8a97b1..7af8a97b1 100644
--- a/media/ffvpx/libavcodec/vp9data.c
+++ b/libs/ffvpx/libavcodec/vp9data.c
diff --git a/media/ffvpx/libavcodec/vp9data.h b/libs/ffvpx/libavcodec/vp9data.h
index 086dbdec0..086dbdec0 100644
--- a/media/ffvpx/libavcodec/vp9data.h
+++ b/libs/ffvpx/libavcodec/vp9data.h
diff --git a/media/ffvpx/libavcodec/vp9dec.h b/libs/ffvpx/libavcodec/vp9dec.h
index 66573edc7..66573edc7 100644
--- a/media/ffvpx/libavcodec/vp9dec.h
+++ b/libs/ffvpx/libavcodec/vp9dec.h
diff --git a/media/ffvpx/libavcodec/vp9dsp.c b/libs/ffvpx/libavcodec/vp9dsp.c
index f6d73f73c..f6d73f73c 100644
--- a/media/ffvpx/libavcodec/vp9dsp.c
+++ b/libs/ffvpx/libavcodec/vp9dsp.c
diff --git a/media/ffvpx/libavcodec/vp9dsp.h b/libs/ffvpx/libavcodec/vp9dsp.h
index e2256316a..e2256316a 100644
--- a/media/ffvpx/libavcodec/vp9dsp.h
+++ b/libs/ffvpx/libavcodec/vp9dsp.h
diff --git a/media/ffvpx/libavcodec/vp9dsp_10bpp.c b/libs/ffvpx/libavcodec/vp9dsp_10bpp.c
index 62ce18207..62ce18207 100644
--- a/media/ffvpx/libavcodec/vp9dsp_10bpp.c
+++ b/libs/ffvpx/libavcodec/vp9dsp_10bpp.c
diff --git a/media/ffvpx/libavcodec/vp9dsp_12bpp.c b/libs/ffvpx/libavcodec/vp9dsp_12bpp.c
index 2f36471c5..2f36471c5 100644
--- a/media/ffvpx/libavcodec/vp9dsp_12bpp.c
+++ b/libs/ffvpx/libavcodec/vp9dsp_12bpp.c
diff --git a/media/ffvpx/libavcodec/vp9dsp_8bpp.c b/libs/ffvpx/libavcodec/vp9dsp_8bpp.c
index 4b219b06b..4b219b06b 100644
--- a/media/ffvpx/libavcodec/vp9dsp_8bpp.c
+++ b/libs/ffvpx/libavcodec/vp9dsp_8bpp.c
diff --git a/media/ffvpx/libavcodec/vp9dsp_template.c b/libs/ffvpx/libavcodec/vp9dsp_template.c
index bb54561a6..bb54561a6 100644
--- a/media/ffvpx/libavcodec/vp9dsp_template.c
+++ b/libs/ffvpx/libavcodec/vp9dsp_template.c
diff --git a/media/ffvpx/libavcodec/vp9lpf.c b/libs/ffvpx/libavcodec/vp9lpf.c
index 414cede85..414cede85 100644
--- a/media/ffvpx/libavcodec/vp9lpf.c
+++ b/libs/ffvpx/libavcodec/vp9lpf.c
diff --git a/media/ffvpx/libavcodec/vp9mvs.c b/libs/ffvpx/libavcodec/vp9mvs.c
index 88db1c341..88db1c341 100644
--- a/media/ffvpx/libavcodec/vp9mvs.c
+++ b/libs/ffvpx/libavcodec/vp9mvs.c
diff --git a/media/ffvpx/libavcodec/vp9prob.c b/libs/ffvpx/libavcodec/vp9prob.c
index fb295b482..fb295b482 100644
--- a/media/ffvpx/libavcodec/vp9prob.c
+++ b/libs/ffvpx/libavcodec/vp9prob.c
diff --git a/media/ffvpx/libavcodec/vp9recon.c b/libs/ffvpx/libavcodec/vp9recon.c
index 49bb04e1f..49bb04e1f 100644
--- a/media/ffvpx/libavcodec/vp9recon.c
+++ b/libs/ffvpx/libavcodec/vp9recon.c
diff --git a/media/ffvpx/libavcodec/vp9shared.h b/libs/ffvpx/libavcodec/vp9shared.h
index 54726df74..54726df74 100644
--- a/media/ffvpx/libavcodec/vp9shared.h
+++ b/libs/ffvpx/libavcodec/vp9shared.h
diff --git a/media/ffvpx/libavcodec/x86/constants.c b/libs/ffvpx/libavcodec/x86/constants.c
index 4bfb78cc3..4bfb78cc3 100644
--- a/media/ffvpx/libavcodec/x86/constants.c
+++ b/libs/ffvpx/libavcodec/x86/constants.c
diff --git a/media/ffvpx/libavcodec/x86/constants.h b/libs/ffvpx/libavcodec/x86/constants.h
index 85da38b7b..85da38b7b 100644
--- a/media/ffvpx/libavcodec/x86/constants.h
+++ b/libs/ffvpx/libavcodec/x86/constants.h
diff --git a/media/ffvpx/libavcodec/x86/flacdsp.asm b/libs/ffvpx/libavcodec/x86/flacdsp.asm
index 713861152..713861152 100644
--- a/media/ffvpx/libavcodec/x86/flacdsp.asm
+++ b/libs/ffvpx/libavcodec/x86/flacdsp.asm
diff --git a/media/ffvpx/libavcodec/x86/flacdsp_init.c b/libs/ffvpx/libavcodec/x86/flacdsp_init.c
index 1971f81b8..1971f81b8 100644
--- a/media/ffvpx/libavcodec/x86/flacdsp_init.c
+++ b/libs/ffvpx/libavcodec/x86/flacdsp_init.c
diff --git a/media/ffvpx/libavcodec/x86/h264_intrapred.asm b/libs/ffvpx/libavcodec/x86/h264_intrapred.asm
index f3aa3172f..f3aa3172f 100644
--- a/media/ffvpx/libavcodec/x86/h264_intrapred.asm
+++ b/libs/ffvpx/libavcodec/x86/h264_intrapred.asm
diff --git a/media/ffvpx/libavcodec/x86/h264_intrapred_10bit.asm b/libs/ffvpx/libavcodec/x86/h264_intrapred_10bit.asm
index 629e0a72e..629e0a72e 100644
--- a/media/ffvpx/libavcodec/x86/h264_intrapred_10bit.asm
+++ b/libs/ffvpx/libavcodec/x86/h264_intrapred_10bit.asm
diff --git a/media/ffvpx/libavcodec/x86/h264_intrapred_init.c b/libs/ffvpx/libavcodec/x86/h264_intrapred_init.c
index bdd5125d6..bdd5125d6 100644
--- a/media/ffvpx/libavcodec/x86/h264_intrapred_init.c
+++ b/libs/ffvpx/libavcodec/x86/h264_intrapred_init.c
diff --git a/media/ffvpx/libavcodec/x86/mathops.h b/libs/ffvpx/libavcodec/x86/mathops.h
index 6298f5ed1..6298f5ed1 100644
--- a/media/ffvpx/libavcodec/x86/mathops.h
+++ b/libs/ffvpx/libavcodec/x86/mathops.h
diff --git a/media/ffvpx/libavcodec/x86/moz.build b/libs/ffvpx/libavcodec/x86/moz.build
index f842b39b4..847d40808 100644
--- a/media/ffvpx/libavcodec/x86/moz.build
+++ b/libs/ffvpx/libavcodec/x86/moz.build
@@ -31,4 +31,4 @@ SOURCES += [
 
 FINAL_LIBRARY = 'mozavcodec'
 
-include('/media/ffvpx/ffvpxcommon.mozbuild')
+include('/libs/ffvpx/ffvpxcommon.mozbuild')
diff --git a/media/ffvpx/libavcodec/x86/videodsp.asm b/libs/ffvpx/libavcodec/x86/videodsp.asm
index e23786070..e23786070 100644
--- a/media/ffvpx/libavcodec/x86/videodsp.asm
+++ b/libs/ffvpx/libavcodec/x86/videodsp.asm
diff --git a/media/ffvpx/libavcodec/x86/videodsp_init.c b/libs/ffvpx/libavcodec/x86/videodsp_init.c
index eeebb4154..eeebb4154 100644
--- a/media/ffvpx/libavcodec/x86/videodsp_init.c
+++ b/libs/ffvpx/libavcodec/x86/videodsp_init.c
diff --git a/media/ffvpx/libavcodec/x86/vp56_arith.h b/libs/ffvpx/libavcodec/x86/vp56_arith.h
index 810cc8dcd..810cc8dcd 100644
--- a/media/ffvpx/libavcodec/x86/vp56_arith.h
+++ b/libs/ffvpx/libavcodec/x86/vp56_arith.h
diff --git a/media/ffvpx/libavcodec/x86/vp8dsp.asm b/libs/ffvpx/libavcodec/x86/vp8dsp.asm
index 75de5690a..75de5690a 100644
--- a/media/ffvpx/libavcodec/x86/vp8dsp.asm
+++ b/libs/ffvpx/libavcodec/x86/vp8dsp.asm
diff --git a/media/ffvpx/libavcodec/x86/vp8dsp_init.c b/libs/ffvpx/libavcodec/x86/vp8dsp_init.c
index 397b2518c..397b2518c 100644
--- a/media/ffvpx/libavcodec/x86/vp8dsp_init.c
+++ b/libs/ffvpx/libavcodec/x86/vp8dsp_init.c
diff --git a/media/ffvpx/libavcodec/x86/vp8dsp_loopfilter.asm b/libs/ffvpx/libavcodec/x86/vp8dsp_loopfilter.asm
index caeb40526..caeb40526 100644
--- a/media/ffvpx/libavcodec/x86/vp8dsp_loopfilter.asm
+++ b/libs/ffvpx/libavcodec/x86/vp8dsp_loopfilter.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init.c b/libs/ffvpx/libavcodec/x86/vp9dsp_init.c
index 837cce850..837cce850 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init.c
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init.c
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init.h b/libs/ffvpx/libavcodec/x86/vp9dsp_init.h
index e410cab3a..e410cab3a 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init.h
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init.h
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init_10bpp.c b/libs/ffvpx/libavcodec/x86/vp9dsp_init_10bpp.c
index 2694c06cb..2694c06cb 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init_10bpp.c
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init_10bpp.c
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init_12bpp.c b/libs/ffvpx/libavcodec/x86/vp9dsp_init_12bpp.c
index 5da3bc184..5da3bc184 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init_12bpp.c
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init_12bpp.c
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init_16bpp.c b/libs/ffvpx/libavcodec/x86/vp9dsp_init_16bpp.c
index 60d10a12a..60d10a12a 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init_16bpp.c
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init_16bpp.c
diff --git a/media/ffvpx/libavcodec/x86/vp9dsp_init_16bpp_template.c b/libs/ffvpx/libavcodec/x86/vp9dsp_init_16bpp_template.c
index b56afc7f5..b56afc7f5 100644
--- a/media/ffvpx/libavcodec/x86/vp9dsp_init_16bpp_template.c
+++ b/libs/ffvpx/libavcodec/x86/vp9dsp_init_16bpp_template.c
diff --git a/media/ffvpx/libavcodec/x86/vp9intrapred.asm b/libs/ffvpx/libavcodec/x86/vp9intrapred.asm
index 31f7d449f..31f7d449f 100644
--- a/media/ffvpx/libavcodec/x86/vp9intrapred.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9intrapred.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9intrapred_16bpp.asm b/libs/ffvpx/libavcodec/x86/vp9intrapred_16bpp.asm
index 32b698243..32b698243 100644
--- a/media/ffvpx/libavcodec/x86/vp9intrapred_16bpp.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9intrapred_16bpp.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9itxfm.asm b/libs/ffvpx/libavcodec/x86/vp9itxfm.asm
index 2c63fe514..2c63fe514 100644
--- a/media/ffvpx/libavcodec/x86/vp9itxfm.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9itxfm.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9itxfm_16bpp.asm b/libs/ffvpx/libavcodec/x86/vp9itxfm_16bpp.asm
index 902685edf..902685edf 100644
--- a/media/ffvpx/libavcodec/x86/vp9itxfm_16bpp.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9itxfm_16bpp.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9itxfm_template.asm b/libs/ffvpx/libavcodec/x86/vp9itxfm_template.asm
index d2f2257d8..d2f2257d8 100644
--- a/media/ffvpx/libavcodec/x86/vp9itxfm_template.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9itxfm_template.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9lpf.asm b/libs/ffvpx/libavcodec/x86/vp9lpf.asm
index 4e7ede223..4e7ede223 100644
--- a/media/ffvpx/libavcodec/x86/vp9lpf.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9lpf.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9lpf_16bpp.asm b/libs/ffvpx/libavcodec/x86/vp9lpf_16bpp.asm
index c0888170c..c0888170c 100644
--- a/media/ffvpx/libavcodec/x86/vp9lpf_16bpp.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9lpf_16bpp.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9mc.asm b/libs/ffvpx/libavcodec/x86/vp9mc.asm
index f64161b2c..f64161b2c 100644
--- a/media/ffvpx/libavcodec/x86/vp9mc.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9mc.asm
diff --git a/media/ffvpx/libavcodec/x86/vp9mc_16bpp.asm b/libs/ffvpx/libavcodec/x86/vp9mc_16bpp.asm
index 9a462eaf8..9a462eaf8 100644
--- a/media/ffvpx/libavcodec/x86/vp9mc_16bpp.asm
+++ b/libs/ffvpx/libavcodec/x86/vp9mc_16bpp.asm
diff --git a/media/ffvpx/libavcodec/xiph.c b/libs/ffvpx/libavcodec/xiph.c
index d072224b4..d072224b4 100644
--- a/media/ffvpx/libavcodec/xiph.c
+++ b/libs/ffvpx/libavcodec/xiph.c
diff --git a/media/ffvpx/libavcodec/xiph.h b/libs/ffvpx/libavcodec/xiph.h
index 1741a51b6..1741a51b6 100644
--- a/media/ffvpx/libavcodec/xiph.h
+++ b/libs/ffvpx/libavcodec/xiph.h
diff --git a/media/ffvpx/libavutil/adler32.c b/libs/ffvpx/libavutil/adler32.c
index c87d5e261..c87d5e261 100644
--- a/media/ffvpx/libavutil/adler32.c
+++ b/libs/ffvpx/libavutil/adler32.c
diff --git a/media/ffvpx/libavutil/adler32.h b/libs/ffvpx/libavutil/adler32.h
index a1f035b73..a1f035b73 100644
--- a/media/ffvpx/libavutil/adler32.h
+++ b/libs/ffvpx/libavutil/adler32.h
diff --git a/media/ffvpx/libavutil/attributes.h b/libs/ffvpx/libavutil/attributes.h
index ced108aa2..ced108aa2 100644
--- a/media/ffvpx/libavutil/attributes.h
+++ b/libs/ffvpx/libavutil/attributes.h
diff --git a/media/ffvpx/libavutil/avassert.h b/libs/ffvpx/libavutil/avassert.h
index 46f3fea58..46f3fea58 100644
--- a/media/ffvpx/libavutil/avassert.h
+++ b/libs/ffvpx/libavutil/avassert.h
diff --git a/media/ffvpx/libavutil/avconfig.h b/libs/ffvpx/libavutil/avconfig.h
index f10aa6186..f10aa6186 100644
--- a/media/ffvpx/libavutil/avconfig.h
+++ b/libs/ffvpx/libavutil/avconfig.h
diff --git a/media/ffvpx/libavutil/avstring.c b/libs/ffvpx/libavutil/avstring.c
index f03dd2514..f03dd2514 100644
--- a/media/ffvpx/libavutil/avstring.c
+++ b/libs/ffvpx/libavutil/avstring.c
diff --git a/media/ffvpx/libavutil/avstring.h b/libs/ffvpx/libavutil/avstring.h
index 04d269564..04d269564 100644
--- a/media/ffvpx/libavutil/avstring.h
+++ b/libs/ffvpx/libavutil/avstring.h
diff --git a/media/ffvpx/libavutil/avutil.h b/libs/ffvpx/libavutil/avutil.h
index 4d633156d..4d633156d 100644
--- a/media/ffvpx/libavutil/avutil.h
+++ b/libs/ffvpx/libavutil/avutil.h
diff --git a/media/ffvpx/libavutil/avutil.symbols b/libs/ffvpx/libavutil/avutil.symbols
index ede2ff9ac..ede2ff9ac 100644
--- a/media/ffvpx/libavutil/avutil.symbols
+++ b/libs/ffvpx/libavutil/avutil.symbols
diff --git a/media/ffvpx/libavutil/avutilres.rc b/libs/ffvpx/libavutil/avutilres.rc
index 40a75eb37..40a75eb37 100644
--- a/media/ffvpx/libavutil/avutilres.rc
+++ b/libs/ffvpx/libavutil/avutilres.rc
diff --git a/media/ffvpx/libavutil/base64.c b/libs/ffvpx/libavutil/base64.c
index 25ae8c411..25ae8c411 100644
--- a/media/ffvpx/libavutil/base64.c
+++ b/libs/ffvpx/libavutil/base64.c
diff --git a/media/ffvpx/libavutil/base64.h b/libs/ffvpx/libavutil/base64.h
index 2954c12d4..2954c12d4 100644
--- a/media/ffvpx/libavutil/base64.h
+++ b/libs/ffvpx/libavutil/base64.h
diff --git a/media/ffvpx/libavutil/bprint.c b/libs/ffvpx/libavutil/bprint.c
index 2f059c5ba..2f059c5ba 100644
--- a/media/ffvpx/libavutil/bprint.c
+++ b/libs/ffvpx/libavutil/bprint.c
diff --git a/media/ffvpx/libavutil/bprint.h b/libs/ffvpx/libavutil/bprint.h
index c09b1ac1e..c09b1ac1e 100644
--- a/media/ffvpx/libavutil/bprint.h
+++ b/libs/ffvpx/libavutil/bprint.h
diff --git a/media/ffvpx/libavutil/bswap.h b/libs/ffvpx/libavutil/bswap.h
index 91cb79538..91cb79538 100644
--- a/media/ffvpx/libavutil/bswap.h
+++ b/libs/ffvpx/libavutil/bswap.h
diff --git a/media/ffvpx/libavutil/buffer.c b/libs/ffvpx/libavutil/buffer.c
index 8d1aa5fa8..8d1aa5fa8 100644
--- a/media/ffvpx/libavutil/buffer.c
+++ b/libs/ffvpx/libavutil/buffer.c
diff --git a/media/ffvpx/libavutil/buffer.h b/libs/ffvpx/libavutil/buffer.h
index 73b6bd0b1..73b6bd0b1 100644
--- a/media/ffvpx/libavutil/buffer.h
+++ b/libs/ffvpx/libavutil/buffer.h
diff --git a/media/ffvpx/libavutil/buffer_internal.h b/libs/ffvpx/libavutil/buffer_internal.h
index 54b67047e..54b67047e 100644
--- a/media/ffvpx/libavutil/buffer_internal.h
+++ b/libs/ffvpx/libavutil/buffer_internal.h
diff --git a/media/ffvpx/libavutil/channel_layout.c b/libs/ffvpx/libavutil/channel_layout.c
index 3bd5ee29b..3bd5ee29b 100644
--- a/media/ffvpx/libavutil/channel_layout.c
+++ b/libs/ffvpx/libavutil/channel_layout.c
diff --git a/media/ffvpx/libavutil/channel_layout.h b/libs/ffvpx/libavutil/channel_layout.h
index 50bb8f03c..50bb8f03c 100644
--- a/media/ffvpx/libavutil/channel_layout.h
+++ b/libs/ffvpx/libavutil/channel_layout.h
diff --git a/media/ffvpx/libavutil/color_utils.c b/libs/ffvpx/libavutil/color_utils.c
index eb8bc7b5f..eb8bc7b5f 100644
--- a/media/ffvpx/libavutil/color_utils.c
+++ b/libs/ffvpx/libavutil/color_utils.c
diff --git a/media/ffvpx/libavutil/color_utils.h b/libs/ffvpx/libavutil/color_utils.h
index 952900645..952900645 100644
--- a/media/ffvpx/libavutil/color_utils.h
+++ b/libs/ffvpx/libavutil/color_utils.h
diff --git a/media/ffvpx/libavutil/colorspace.h b/libs/ffvpx/libavutil/colorspace.h
index b6dba2c95..b6dba2c95 100644
--- a/media/ffvpx/libavutil/colorspace.h
+++ b/libs/ffvpx/libavutil/colorspace.h
diff --git a/media/ffvpx/libavutil/common.h b/libs/ffvpx/libavutil/common.h
index 8db029117..8db029117 100644
--- a/media/ffvpx/libavutil/common.h
+++ b/libs/ffvpx/libavutil/common.h
diff --git a/media/ffvpx/libavutil/cpu.c b/libs/ffvpx/libavutil/cpu.c
index 6548cc304..6548cc304 100644
--- a/media/ffvpx/libavutil/cpu.c
+++ b/libs/ffvpx/libavutil/cpu.c
diff --git a/media/ffvpx/libavutil/cpu.h b/libs/ffvpx/libavutil/cpu.h
index 8bb9eb606..8bb9eb606 100644
--- a/media/ffvpx/libavutil/cpu.h
+++ b/libs/ffvpx/libavutil/cpu.h
diff --git a/media/ffvpx/libavutil/cpu_internal.h b/libs/ffvpx/libavutil/cpu_internal.h
index 37122d1c5..37122d1c5 100644
--- a/media/ffvpx/libavutil/cpu_internal.h
+++ b/libs/ffvpx/libavutil/cpu_internal.h
diff --git a/media/ffvpx/libavutil/crc.c b/libs/ffvpx/libavutil/crc.c
index c45ea63a6..c45ea63a6 100644
--- a/media/ffvpx/libavutil/crc.c
+++ b/libs/ffvpx/libavutil/crc.c
diff --git a/media/ffvpx/libavutil/crc.h b/libs/ffvpx/libavutil/crc.h
index 47e22b4c7..47e22b4c7 100644
--- a/media/ffvpx/libavutil/crc.h
+++ b/libs/ffvpx/libavutil/crc.h
diff --git a/media/ffvpx/libavutil/dict.c b/libs/ffvpx/libavutil/dict.c
index 0ea71386e..0ea71386e 100644
--- a/media/ffvpx/libavutil/dict.c
+++ b/libs/ffvpx/libavutil/dict.c
diff --git a/media/ffvpx/libavutil/dict.h b/libs/ffvpx/libavutil/dict.h
index 118f1f00e..118f1f00e 100644
--- a/media/ffvpx/libavutil/dict.h
+++ b/libs/ffvpx/libavutil/dict.h
diff --git a/media/ffvpx/libavutil/dummy_funcs.c b/libs/ffvpx/libavutil/dummy_funcs.c
index 5d1cdc819..5d1cdc819 100644
--- a/media/ffvpx/libavutil/dummy_funcs.c
+++ b/libs/ffvpx/libavutil/dummy_funcs.c
diff --git a/media/ffvpx/libavutil/dynarray.h b/libs/ffvpx/libavutil/dynarray.h
index 034a9fedf..034a9fedf 100644
--- a/media/ffvpx/libavutil/dynarray.h
+++ b/libs/ffvpx/libavutil/dynarray.h
diff --git a/media/ffvpx/libavutil/error.c b/libs/ffvpx/libavutil/error.c
index b96304837..b96304837 100644
--- a/media/ffvpx/libavutil/error.c
+++ b/libs/ffvpx/libavutil/error.c
diff --git a/media/ffvpx/libavutil/error.h b/libs/ffvpx/libavutil/error.h
index 71df4da35..71df4da35 100644
--- a/media/ffvpx/libavutil/error.h
+++ b/libs/ffvpx/libavutil/error.h
diff --git a/media/ffvpx/libavutil/eval.c b/libs/ffvpx/libavutil/eval.c
index efed91b6e..efed91b6e 100644
--- a/media/ffvpx/libavutil/eval.c
+++ b/libs/ffvpx/libavutil/eval.c
diff --git a/media/ffvpx/libavutil/eval.h b/libs/ffvpx/libavutil/eval.h
index dacd22b96..dacd22b96 100644
--- a/media/ffvpx/libavutil/eval.h
+++ b/libs/ffvpx/libavutil/eval.h
diff --git a/media/ffvpx/libavutil/ffmath.h b/libs/ffvpx/libavutil/ffmath.h
index aad1347f2..aad1347f2 100644
--- a/media/ffvpx/libavutil/ffmath.h
+++ b/libs/ffvpx/libavutil/ffmath.h
diff --git a/media/ffvpx/libavutil/fftime.h b/libs/ffvpx/libavutil/fftime.h
index dc169b064..dc169b064 100644
--- a/media/ffvpx/libavutil/fftime.h
+++ b/libs/ffvpx/libavutil/fftime.h
diff --git a/media/ffvpx/libavutil/ffversion.h b/libs/ffvpx/libavutil/ffversion.h
index 9b533e039..9b533e039 100644
--- a/media/ffvpx/libavutil/ffversion.h
+++ b/libs/ffvpx/libavutil/ffversion.h
diff --git a/media/ffvpx/libavutil/fifo.c b/libs/ffvpx/libavutil/fifo.c
index 1060aedf1..1060aedf1 100644
--- a/media/ffvpx/libavutil/fifo.c
+++ b/libs/ffvpx/libavutil/fifo.c
diff --git a/media/ffvpx/libavutil/fifo.h b/libs/ffvpx/libavutil/fifo.h
index dc7bc6f0d..dc7bc6f0d 100644
--- a/media/ffvpx/libavutil/fifo.h
+++ b/libs/ffvpx/libavutil/fifo.h
diff --git a/media/ffvpx/libavutil/fixed_dsp.c b/libs/ffvpx/libavutil/fixed_dsp.c
index 8c018581d..8c018581d 100644
--- a/media/ffvpx/libavutil/fixed_dsp.c
+++ b/libs/ffvpx/libavutil/fixed_dsp.c
diff --git a/media/ffvpx/libavutil/fixed_dsp.h b/libs/ffvpx/libavutil/fixed_dsp.h
index f554cb503..f554cb503 100644
--- a/media/ffvpx/libavutil/fixed_dsp.h
+++ b/libs/ffvpx/libavutil/fixed_dsp.h
diff --git a/media/ffvpx/libavutil/float_dsp.c b/libs/ffvpx/libavutil/float_dsp.c
index 1d4911d81..1d4911d81 100644
--- a/media/ffvpx/libavutil/float_dsp.c
+++ b/libs/ffvpx/libavutil/float_dsp.c
diff --git a/media/ffvpx/libavutil/float_dsp.h b/libs/ffvpx/libavutil/float_dsp.h
index 2c24d9347..2c24d9347 100644
--- a/media/ffvpx/libavutil/float_dsp.h
+++ b/libs/ffvpx/libavutil/float_dsp.h
diff --git a/media/ffvpx/libavutil/frame.c b/libs/ffvpx/libavutil/frame.c
index 00215ac29..00215ac29 100644
--- a/media/ffvpx/libavutil/frame.c
+++ b/libs/ffvpx/libavutil/frame.c
diff --git a/media/ffvpx/libavutil/frame.h b/libs/ffvpx/libavutil/frame.h
index 9d57d6ce6..9d57d6ce6 100644
--- a/media/ffvpx/libavutil/frame.h
+++ b/libs/ffvpx/libavutil/frame.h
diff --git a/media/ffvpx/libavutil/hwcontext.c b/libs/ffvpx/libavutil/hwcontext.c
index 70c556eca..70c556eca 100644
--- a/media/ffvpx/libavutil/hwcontext.c
+++ b/libs/ffvpx/libavutil/hwcontext.c
diff --git a/media/ffvpx/libavutil/hwcontext.h b/libs/ffvpx/libavutil/hwcontext.h
index f5a4b6238..f5a4b6238 100644
--- a/media/ffvpx/libavutil/hwcontext.h
+++ b/libs/ffvpx/libavutil/hwcontext.h
diff --git a/media/ffvpx/libavutil/hwcontext_internal.h b/libs/ffvpx/libavutil/hwcontext_internal.h
index 332062dda..332062dda 100644
--- a/media/ffvpx/libavutil/hwcontext_internal.h
+++ b/libs/ffvpx/libavutil/hwcontext_internal.h
diff --git a/media/ffvpx/libavutil/imgutils.c b/libs/ffvpx/libavutil/imgutils.c
index 4938a7ef6..4938a7ef6 100644
--- a/media/ffvpx/libavutil/imgutils.c
+++ b/libs/ffvpx/libavutil/imgutils.c
diff --git a/media/ffvpx/libavutil/imgutils.h b/libs/ffvpx/libavutil/imgutils.h
index 5b790ecf0..5b790ecf0 100644
--- a/media/ffvpx/libavutil/imgutils.h
+++ b/libs/ffvpx/libavutil/imgutils.h
diff --git a/media/ffvpx/libavutil/imgutils_internal.h b/libs/ffvpx/libavutil/imgutils_internal.h
index d51585841..d51585841 100644
--- a/media/ffvpx/libavutil/imgutils_internal.h
+++ b/libs/ffvpx/libavutil/imgutils_internal.h
diff --git a/media/ffvpx/libavutil/integer.c b/libs/ffvpx/libavutil/integer.c
index 890e314dc..890e314dc 100644
--- a/media/ffvpx/libavutil/integer.c
+++ b/libs/ffvpx/libavutil/integer.c
diff --git a/media/ffvpx/libavutil/integer.h b/libs/ffvpx/libavutil/integer.h
index 45f733c04..45f733c04 100644
--- a/media/ffvpx/libavutil/integer.h
+++ b/libs/ffvpx/libavutil/integer.h
diff --git a/media/ffvpx/libavutil/internal.h b/libs/ffvpx/libavutil/internal.h
index 06bd561e8..06bd561e8 100644
--- a/media/ffvpx/libavutil/internal.h
+++ b/libs/ffvpx/libavutil/internal.h
diff --git a/media/ffvpx/libavutil/intfloat.h b/libs/ffvpx/libavutil/intfloat.h
index fe3d7ec4a..fe3d7ec4a 100644
--- a/media/ffvpx/libavutil/intfloat.h
+++ b/libs/ffvpx/libavutil/intfloat.h
diff --git a/media/ffvpx/libavutil/intmath.c b/libs/ffvpx/libavutil/intmath.c
index b0c00e1ca..b0c00e1ca 100644
--- a/media/ffvpx/libavutil/intmath.c
+++ b/libs/ffvpx/libavutil/intmath.c
diff --git a/media/ffvpx/libavutil/intmath.h b/libs/ffvpx/libavutil/intmath.h
index 9573109e9..9573109e9 100644
--- a/media/ffvpx/libavutil/intmath.h
+++ b/libs/ffvpx/libavutil/intmath.h
diff --git a/media/ffvpx/libavutil/intreadwrite.h b/libs/ffvpx/libavutil/intreadwrite.h
index 67c763b13..67c763b13 100644
--- a/media/ffvpx/libavutil/intreadwrite.h
+++ b/libs/ffvpx/libavutil/intreadwrite.h
diff --git a/media/ffvpx/libavutil/libm.h b/libs/ffvpx/libavutil/libm.h
index a81996239..a81996239 100644
--- a/media/ffvpx/libavutil/libm.h
+++ b/libs/ffvpx/libavutil/libm.h
diff --git a/media/ffvpx/libavutil/lls.c b/libs/ffvpx/libavutil/lls.c
index 0560b6a79..0560b6a79 100644
--- a/media/ffvpx/libavutil/lls.c
+++ b/libs/ffvpx/libavutil/lls.c
diff --git a/media/ffvpx/libavutil/lls.h b/libs/ffvpx/libavutil/lls.h
index 1a276d537..1a276d537 100644
--- a/media/ffvpx/libavutil/lls.h
+++ b/libs/ffvpx/libavutil/lls.h
diff --git a/media/ffvpx/libavutil/log.c b/libs/ffvpx/libavutil/log.c
index 9b7d48487..9b7d48487 100644
--- a/media/ffvpx/libavutil/log.c
+++ b/libs/ffvpx/libavutil/log.c
diff --git a/media/ffvpx/libavutil/log.h b/libs/ffvpx/libavutil/log.h
index d9554e609..d9554e609 100644
--- a/media/ffvpx/libavutil/log.h
+++ b/libs/ffvpx/libavutil/log.h
diff --git a/media/ffvpx/libavutil/log2_tab.c b/libs/ffvpx/libavutil/log2_tab.c
index 0dbf07d74..0dbf07d74 100644
--- a/media/ffvpx/libavutil/log2_tab.c
+++ b/libs/ffvpx/libavutil/log2_tab.c
diff --git a/media/ffvpx/libavutil/macros.h b/libs/ffvpx/libavutil/macros.h
index 2007ee561..2007ee561 100644
--- a/media/ffvpx/libavutil/macros.h
+++ b/libs/ffvpx/libavutil/macros.h
diff --git a/media/ffvpx/libavutil/mathematics.c b/libs/ffvpx/libavutil/mathematics.c
index 1bf044cdf..1bf044cdf 100644
--- a/media/ffvpx/libavutil/mathematics.c
+++ b/libs/ffvpx/libavutil/mathematics.c
diff --git a/media/ffvpx/libavutil/mathematics.h b/libs/ffvpx/libavutil/mathematics.h
index 54901800b..54901800b 100644
--- a/media/ffvpx/libavutil/mathematics.h
+++ b/libs/ffvpx/libavutil/mathematics.h
diff --git a/media/ffvpx/libavutil/mem.c b/libs/ffvpx/libavutil/mem.c
index 6149755a6..6149755a6 100644
--- a/media/ffvpx/libavutil/mem.c
+++ b/libs/ffvpx/libavutil/mem.c
diff --git a/media/ffvpx/libavutil/mem.h b/libs/ffvpx/libavutil/mem.h
index 7e0b12a8a..7e0b12a8a 100644
--- a/media/ffvpx/libavutil/mem.h
+++ b/libs/ffvpx/libavutil/mem.h
diff --git a/media/ffvpx/libavutil/mem_internal.h b/libs/ffvpx/libavutil/mem_internal.h
index 6fdbcb016..6fdbcb016 100644
--- a/media/ffvpx/libavutil/mem_internal.h
+++ b/libs/ffvpx/libavutil/mem_internal.h
diff --git a/media/ffvpx/libavutil/moz.build b/libs/ffvpx/libavutil/moz.build
index 870934f52..870934f52 100644
--- a/media/ffvpx/libavutil/moz.build
+++ b/libs/ffvpx/libavutil/moz.build
diff --git a/media/ffvpx/libavutil/opt.c b/libs/ffvpx/libavutil/opt.c
index 3b0aab4ee..3b0aab4ee 100644
--- a/media/ffvpx/libavutil/opt.c
+++ b/libs/ffvpx/libavutil/opt.c
diff --git a/media/ffvpx/libavutil/opt.h b/libs/ffvpx/libavutil/opt.h
index 07da68ea2..07da68ea2 100644
--- a/media/ffvpx/libavutil/opt.h
+++ b/libs/ffvpx/libavutil/opt.h
diff --git a/media/ffvpx/libavutil/parseutils.c b/libs/ffvpx/libavutil/parseutils.c
index 9de19d1c1..9de19d1c1 100644
--- a/media/ffvpx/libavutil/parseutils.c
+++ b/libs/ffvpx/libavutil/parseutils.c
diff --git a/media/ffvpx/libavutil/parseutils.h b/libs/ffvpx/libavutil/parseutils.h
index e66d24b76..e66d24b76 100644
--- a/media/ffvpx/libavutil/parseutils.h
+++ b/libs/ffvpx/libavutil/parseutils.h
diff --git a/media/ffvpx/libavutil/pixdesc.c b/libs/ffvpx/libavutil/pixdesc.c
index 8ed52751c..8ed52751c 100644
--- a/media/ffvpx/libavutil/pixdesc.c
+++ b/libs/ffvpx/libavutil/pixdesc.c
diff --git a/media/ffvpx/libavutil/pixdesc.h b/libs/ffvpx/libavutil/pixdesc.h
index 1ab372782..1ab372782 100644
--- a/media/ffvpx/libavutil/pixdesc.h
+++ b/libs/ffvpx/libavutil/pixdesc.h
diff --git a/media/ffvpx/libavutil/pixelutils.c b/libs/ffvpx/libavutil/pixelutils.c
index b663027b4..b663027b4 100644
--- a/media/ffvpx/libavutil/pixelutils.c
+++ b/libs/ffvpx/libavutil/pixelutils.c
diff --git a/media/ffvpx/libavutil/pixelutils.h b/libs/ffvpx/libavutil/pixelutils.h
index a8dbc157e..a8dbc157e 100644
--- a/media/ffvpx/libavutil/pixelutils.h
+++ b/libs/ffvpx/libavutil/pixelutils.h
diff --git a/media/ffvpx/libavutil/pixfmt.h b/libs/ffvpx/libavutil/pixfmt.h
index e184a5667..e184a5667 100644
--- a/media/ffvpx/libavutil/pixfmt.h
+++ b/libs/ffvpx/libavutil/pixfmt.h
diff --git a/media/ffvpx/libavutil/qsort.h b/libs/ffvpx/libavutil/qsort.h
index 39b7a0885..39b7a0885 100644
--- a/media/ffvpx/libavutil/qsort.h
+++ b/libs/ffvpx/libavutil/qsort.h
diff --git a/media/ffvpx/libavutil/rational.c b/libs/ffvpx/libavutil/rational.c
index 35ee08877..35ee08877 100644
--- a/media/ffvpx/libavutil/rational.c
+++ b/libs/ffvpx/libavutil/rational.c
diff --git a/media/ffvpx/libavutil/rational.h b/libs/ffvpx/libavutil/rational.h
index 5c6b67b4e..5c6b67b4e 100644
--- a/media/ffvpx/libavutil/rational.h
+++ b/libs/ffvpx/libavutil/rational.h
diff --git a/media/ffvpx/libavutil/replaygain.h b/libs/ffvpx/libavutil/replaygain.h
index b49bf1a3d..b49bf1a3d 100644
--- a/media/ffvpx/libavutil/replaygain.h
+++ b/libs/ffvpx/libavutil/replaygain.h
diff --git a/media/ffvpx/libavutil/reverse.c b/libs/ffvpx/libavutil/reverse.c
index 105eb03dd..105eb03dd 100644
--- a/media/ffvpx/libavutil/reverse.c
+++ b/libs/ffvpx/libavutil/reverse.c
diff --git a/media/ffvpx/libavutil/reverse.h b/libs/ffvpx/libavutil/reverse.h
index 4eb612393..4eb612393 100644
--- a/media/ffvpx/libavutil/reverse.h
+++ b/libs/ffvpx/libavutil/reverse.h
diff --git a/media/ffvpx/libavutil/samplefmt.c b/libs/ffvpx/libavutil/samplefmt.c
index fc077f644..fc077f644 100644
--- a/media/ffvpx/libavutil/samplefmt.c
+++ b/libs/ffvpx/libavutil/samplefmt.c
diff --git a/media/ffvpx/libavutil/samplefmt.h b/libs/ffvpx/libavutil/samplefmt.h
index 8cd43ae85..8cd43ae85 100644
--- a/media/ffvpx/libavutil/samplefmt.h
+++ b/libs/ffvpx/libavutil/samplefmt.h
diff --git a/media/ffvpx/libavutil/slicethread.c b/libs/ffvpx/libavutil/slicethread.c
index dfbe551ef..dfbe551ef 100644
--- a/media/ffvpx/libavutil/slicethread.c
+++ b/libs/ffvpx/libavutil/slicethread.c
diff --git a/media/ffvpx/libavutil/slicethread.h b/libs/ffvpx/libavutil/slicethread.h
index f6f6f302c..f6f6f302c 100644
--- a/media/ffvpx/libavutil/slicethread.h
+++ b/libs/ffvpx/libavutil/slicethread.h
diff --git a/media/ffvpx/libavutil/thread.h b/libs/ffvpx/libavutil/thread.h
index cc5272d37..cc5272d37 100644
--- a/media/ffvpx/libavutil/thread.h
+++ b/libs/ffvpx/libavutil/thread.h
diff --git a/media/ffvpx/libavutil/threadmessage.c b/libs/ffvpx/libavutil/threadmessage.c
index 872e9392b..872e9392b 100644
--- a/media/ffvpx/libavutil/threadmessage.c
+++ b/libs/ffvpx/libavutil/threadmessage.c
diff --git a/media/ffvpx/libavutil/threadmessage.h b/libs/ffvpx/libavutil/threadmessage.h
index 8480a0a3d..8480a0a3d 100644
--- a/media/ffvpx/libavutil/threadmessage.h
+++ b/libs/ffvpx/libavutil/threadmessage.h
diff --git a/media/ffvpx/libavutil/time.c b/libs/ffvpx/libavutil/time.c
index 80d1faf26..80d1faf26 100644
--- a/media/ffvpx/libavutil/time.c
+++ b/libs/ffvpx/libavutil/time.c
diff --git a/media/ffvpx/libavutil/time_internal.h b/libs/ffvpx/libavutil/time_internal.h
index 612a75a04..612a75a04 100644
--- a/media/ffvpx/libavutil/time_internal.h
+++ b/libs/ffvpx/libavutil/time_internal.h
diff --git a/media/ffvpx/libavutil/timecode.c b/libs/ffvpx/libavutil/timecode.c
index 60077ba0c..60077ba0c 100644
--- a/media/ffvpx/libavutil/timecode.c
+++ b/libs/ffvpx/libavutil/timecode.c
diff --git a/media/ffvpx/libavutil/timecode.h b/libs/ffvpx/libavutil/timecode.h
index 37c1361bc..37c1361bc 100644
--- a/media/ffvpx/libavutil/timecode.h
+++ b/libs/ffvpx/libavutil/timecode.h
diff --git a/media/ffvpx/libavutil/timer.h b/libs/ffvpx/libavutil/timer.h
index 0bb353cfc..0bb353cfc 100644
--- a/media/ffvpx/libavutil/timer.h
+++ b/libs/ffvpx/libavutil/timer.h
diff --git a/media/ffvpx/libavutil/timestamp.h b/libs/ffvpx/libavutil/timestamp.h
index e082f01b4..e082f01b4 100644
--- a/media/ffvpx/libavutil/timestamp.h
+++ b/libs/ffvpx/libavutil/timestamp.h
diff --git a/media/ffvpx/libavutil/utils.c b/libs/ffvpx/libavutil/utils.c
index 230081ea4..230081ea4 100644
--- a/media/ffvpx/libavutil/utils.c
+++ b/libs/ffvpx/libavutil/utils.c
diff --git a/media/ffvpx/libavutil/version.h b/libs/ffvpx/libavutil/version.h
index 3a63e6355..3a63e6355 100644
--- a/media/ffvpx/libavutil/version.h
+++ b/libs/ffvpx/libavutil/version.h
diff --git a/media/ffvpx/libavutil/x86/asm.h b/libs/ffvpx/libavutil/x86/asm.h
index 9bff42d62..9bff42d62 100644
--- a/media/ffvpx/libavutil/x86/asm.h
+++ b/libs/ffvpx/libavutil/x86/asm.h
diff --git a/media/ffvpx/libavutil/x86/bswap.h b/libs/ffvpx/libavutil/x86/bswap.h
index ffa59e4c8..ffa59e4c8 100644
--- a/media/ffvpx/libavutil/x86/bswap.h
+++ b/libs/ffvpx/libavutil/x86/bswap.h
diff --git a/media/ffvpx/libavutil/x86/cpu.c b/libs/ffvpx/libavutil/x86/cpu.c
index aca893174..aca893174 100644
--- a/media/ffvpx/libavutil/x86/cpu.c
+++ b/libs/ffvpx/libavutil/x86/cpu.c
diff --git a/media/ffvpx/libavutil/x86/cpu.h b/libs/ffvpx/libavutil/x86/cpu.h
index 937c697fa..937c697fa 100644
--- a/media/ffvpx/libavutil/x86/cpu.h
+++ b/libs/ffvpx/libavutil/x86/cpu.h
diff --git a/media/ffvpx/libavutil/x86/cpuid.asm b/libs/ffvpx/libavutil/x86/cpuid.asm
index c3f7866ec..c3f7866ec 100644
--- a/media/ffvpx/libavutil/x86/cpuid.asm
+++ b/libs/ffvpx/libavutil/x86/cpuid.asm
diff --git a/media/ffvpx/libavutil/x86/emms.asm b/libs/ffvpx/libavutil/x86/emms.asm
index 8611762d7..8611762d7 100644
--- a/media/ffvpx/libavutil/x86/emms.asm
+++ b/libs/ffvpx/libavutil/x86/emms.asm
diff --git a/media/ffvpx/libavutil/x86/emms.h b/libs/ffvpx/libavutil/x86/emms.h
index c21e34b45..c21e34b45 100644
--- a/media/ffvpx/libavutil/x86/emms.h
+++ b/libs/ffvpx/libavutil/x86/emms.h
diff --git a/media/ffvpx/libavutil/x86/fixed_dsp.asm b/libs/ffvpx/libavutil/x86/fixed_dsp.asm
index 979dd5c33..979dd5c33 100644
--- a/media/ffvpx/libavutil/x86/fixed_dsp.asm
+++ b/libs/ffvpx/libavutil/x86/fixed_dsp.asm
diff --git a/media/ffvpx/libavutil/x86/fixed_dsp_init.c b/libs/ffvpx/libavutil/x86/fixed_dsp_init.c
index 303a2eb92..303a2eb92 100644
--- a/media/ffvpx/libavutil/x86/fixed_dsp_init.c
+++ b/libs/ffvpx/libavutil/x86/fixed_dsp_init.c
diff --git a/media/ffvpx/libavutil/x86/float_dsp.asm b/libs/ffvpx/libavutil/x86/float_dsp.asm
index 06d2d2cfd..06d2d2cfd 100644
--- a/media/ffvpx/libavutil/x86/float_dsp.asm
+++ b/libs/ffvpx/libavutil/x86/float_dsp.asm
diff --git a/media/ffvpx/libavutil/x86/float_dsp_init.c b/libs/ffvpx/libavutil/x86/float_dsp_init.c
index 122087a19..122087a19 100644
--- a/media/ffvpx/libavutil/x86/float_dsp_init.c
+++ b/libs/ffvpx/libavutil/x86/float_dsp_init.c
diff --git a/media/ffvpx/libavutil/x86/imgutils.asm b/libs/ffvpx/libavutil/x86/imgutils.asm
index 3cca56cdc..3cca56cdc 100644
--- a/media/ffvpx/libavutil/x86/imgutils.asm
+++ b/libs/ffvpx/libavutil/x86/imgutils.asm
diff --git a/media/ffvpx/libavutil/x86/imgutils_init.c b/libs/ffvpx/libavutil/x86/imgutils_init.c
index 4ea398205..4ea398205 100644
--- a/media/ffvpx/libavutil/x86/imgutils_init.c
+++ b/libs/ffvpx/libavutil/x86/imgutils_init.c
diff --git a/media/ffvpx/libavutil/x86/intmath.h b/libs/ffvpx/libavutil/x86/intmath.h
index 40743fd13..40743fd13 100644
--- a/media/ffvpx/libavutil/x86/intmath.h
+++ b/libs/ffvpx/libavutil/x86/intmath.h
diff --git a/media/ffvpx/libavutil/x86/intreadwrite.h b/libs/ffvpx/libavutil/x86/intreadwrite.h
index 4061d1923..4061d1923 100644
--- a/media/ffvpx/libavutil/x86/intreadwrite.h
+++ b/libs/ffvpx/libavutil/x86/intreadwrite.h
diff --git a/media/ffvpx/libavutil/x86/lls.asm b/libs/ffvpx/libavutil/x86/lls.asm
index 317fba6fc..317fba6fc 100644
--- a/media/ffvpx/libavutil/x86/lls.asm
+++ b/libs/ffvpx/libavutil/x86/lls.asm
diff --git a/media/ffvpx/libavutil/x86/lls_init.c b/libs/ffvpx/libavutil/x86/lls_init.c
index 1c5dca42d..1c5dca42d 100644
--- a/media/ffvpx/libavutil/x86/lls_init.c
+++ b/libs/ffvpx/libavutil/x86/lls_init.c
diff --git a/media/ffvpx/libavutil/x86/moz.build b/libs/ffvpx/libavutil/x86/moz.build
index 0478f9313..b61e9ed90 100644
--- a/media/ffvpx/libavutil/x86/moz.build
+++ b/libs/ffvpx/libavutil/x86/moz.build
@@ -19,4 +19,4 @@ SOURCES += [
 
 FINAL_LIBRARY = 'mozavutil'
 
-include('/media/ffvpx/ffvpxcommon.mozbuild')
+include('/libs/ffvpx/ffvpxcommon.mozbuild')
diff --git a/media/ffvpx/libavutil/x86/pixelutils.asm b/libs/ffvpx/libavutil/x86/pixelutils.asm
index 7af3007d0..7af3007d0 100644
--- a/media/ffvpx/libavutil/x86/pixelutils.asm
+++ b/libs/ffvpx/libavutil/x86/pixelutils.asm
diff --git a/media/ffvpx/libavutil/x86/pixelutils.h b/libs/ffvpx/libavutil/x86/pixelutils.h
index 876cf4605..876cf4605 100644
--- a/media/ffvpx/libavutil/x86/pixelutils.h
+++ b/libs/ffvpx/libavutil/x86/pixelutils.h
diff --git a/media/ffvpx/libavutil/x86/pixelutils_init.c b/libs/ffvpx/libavutil/x86/pixelutils_init.c
index c24a533ae..c24a533ae 100644
--- a/media/ffvpx/libavutil/x86/pixelutils_init.c
+++ b/libs/ffvpx/libavutil/x86/pixelutils_init.c
diff --git a/media/ffvpx/libavutil/x86/timer.h b/libs/ffvpx/libavutil/x86/timer.h
index 4d1e88def..4d1e88def 100644
--- a/media/ffvpx/libavutil/x86/timer.h
+++ b/libs/ffvpx/libavutil/x86/timer.h
diff --git a/media/ffvpx/libavutil/x86/x86inc.asm b/libs/ffvpx/libavutil/x86/x86inc.asm
index 5044ee86f..5044ee86f 100644
--- a/media/ffvpx/libavutil/x86/x86inc.asm
+++ b/libs/ffvpx/libavutil/x86/x86inc.asm
diff --git a/media/ffvpx/libavutil/x86/x86util.asm b/libs/ffvpx/libavutil/x86/x86util.asm
index d7cd99684..d7cd99684 100644
--- a/media/ffvpx/libavutil/x86/x86util.asm
+++ b/libs/ffvpx/libavutil/x86/x86util.asm
diff --git a/media/ffvpx/libavutil_visibility.h b/libs/ffvpx/libavutil_visibility.h
index 706aacdf3..706aacdf3 100644
--- a/media/ffvpx/libavutil_visibility.h
+++ b/libs/ffvpx/libavutil_visibility.h
diff --git a/media/ffvpx/moz.build b/libs/ffvpx/moz.build
index cf5b147d8..cf5b147d8 100644
--- a/media/ffvpx/moz.build
+++ b/libs/ffvpx/moz.build
diff --git a/libs/moz.build b/libs/moz.build
index 60be5576a..804aca10a 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -57,6 +57,9 @@ if CONFIG['CPU_ARCH'] == 'arm':
 if CONFIG['MOZ_AV1']:
     DIRS += ['libaom']
 
+if CONFIG['MOZ_FFVPX']:
+    DIRS += ['ffvpx']
+
 # modules
 DIRS += [
     'brotli',