Move aom source to a sub-directory under media/libaom

There is no damned reason to treat this differently than any other media lib given its license and there never was.

1002 files changed, 517 insertions, 517 deletions

diff --git a/media/libaom/generate_sources_mozbuild.py b/media/libaom/generate_sources_mozbuild.py
index a5a75d8be..2f89c9948 100644
--- a/media/libaom/generate_sources_mozbuild.py
+++ b/media/libaom/generate_sources_mozbuild.py
@@ -9,7 +9,7 @@ import os
 import re
 import subprocess
 
-AOM_DIR = '../../third_party/aom'
+AOM_DIR = '/media/libaom/src'
 
 def write_aom_config(system, arch, variables, cache_variables):
     # read template cmake file
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
index fc12b7230..d712d145d 100755
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -15,7 +15,7 @@
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
-LIBAOM_SRC_DIR="../../third_party/aom"
+LIBAOM_SRC_DIR="/media/libaom/src"
 LIBAOM_CONFIG_DIR="config"
 
 # Print license header.
diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index e376878cc..f2d122d76 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -134,10 +134,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
 ASFLAGS += CONFIG['VPX_ASFLAGS']
 ASFLAGS += [
     '-I.',
-    '-I%s/third_party/aom' % TOPSRCDIR,
+    '-I%s/media/libaom/src' % TOPSRCDIR,
 ]
 
 LOCAL_INCLUDES += [
     '/media/libaom/config', # aom_version.h
-    '/third_party/aom',
+    '/media/libaom/src',
 ]
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index 9aff837c4..939637637 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -2,532 +2,532 @@
 
 files = {
   'ARM_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/arm.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/arm.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'ARM_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
-    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
-    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
-    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
-    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/arm_cpudetect.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
-    '../../third_party/aom/av1/common/arm/cfl_neon.c',
-    '../../third_party/aom/av1/common/arm/convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/jnt_convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
-    '../../third_party/aom/av1/common/arm/selfguided_neon.c',
-    '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
-    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_neon.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
-    '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c',
+    '/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c',
+    '/media/libaom/src/aom_dsp/arm/intrapred_neon.c',
+    '/media/libaom/src/aom_dsp/arm/loopfilter_neon.c',
+    '/media/libaom/src/aom_dsp/arm/subtract_neon.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/arm_cpudetect.c',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c',
+    '/media/libaom/src/av1/common/arm/av1_txfm_neon.c',
+    '/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c',
+    '/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c',
+    '/media/libaom/src/av1/common/arm/cfl_neon.c',
+    '/media/libaom/src/av1/common/arm/convolve_neon.c',
+    '/media/libaom/src/av1/common/arm/jnt_convolve_neon.c',
+    '/media/libaom/src/av1/common/arm/reconinter_neon.c',
+    '/media/libaom/src/av1/common/arm/selfguided_neon.c',
+    '/media/libaom/src/av1/common/arm/warp_plane_neon.c',
+    '/media/libaom/src/av1/common/arm/wiener_convolve_neon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_neon.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
+    '/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
   ],
   'GENERIC_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'GENERIC_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
   'IA32_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'IA32_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/emms.asm',
+    '/media/libaom/src/aom_ports/x86_abi_support.asm',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_avx2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse4.c',
+    '/media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
   'X64_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '/media/libaom/src/aom/aom.h',
+    '/media/libaom/src/aom/aom_codec.h',
+    '/media/libaom/src/aom/aom_decoder.h',
+    '/media/libaom/src/aom/aom_encoder.h',
+    '/media/libaom/src/aom/aom_frame_buffer.h',
+    '/media/libaom/src/aom/aom_image.h',
+    '/media/libaom/src/aom/aom_integer.h',
+    '/media/libaom/src/aom/aomcx.h',
+    '/media/libaom/src/aom/aomdx.h',
+    '/media/libaom/src/aom_mem/aom_mem.h',
+    '/media/libaom/src/aom_ports/aom_timer.h',
+    '/media/libaom/src/aom_ports/bitops.h',
+    '/media/libaom/src/aom_ports/mem.h',
+    '/media/libaom/src/aom_ports/sanitizer.h',
+    '/media/libaom/src/aom_ports/system_state.h',
+    '/media/libaom/src/aom_scale/aom_scale.h',
+    '/media/libaom/src/aom_scale/yv12config.h',
   ],
   'X64_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dthread.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '/media/libaom/src/aom/src/aom_codec.c',
+    '/media/libaom/src/aom/src/aom_decoder.c',
+    '/media/libaom/src/aom/src/aom_encoder.c',
+    '/media/libaom/src/aom/src/aom_image.c',
+    '/media/libaom/src/aom/src/aom_integer.c',
+    '/media/libaom/src/aom_dsp/aom_convolve.c',
+    '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '/media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '/media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '/media/libaom/src/aom_dsp/daalaboolreader.c',
+    '/media/libaom/src/aom_dsp/entcode.c',
+    '/media/libaom/src/aom_dsp/entdec.c',
+    '/media/libaom/src/aom_dsp/fft.c',
+    '/media/libaom/src/aom_dsp/grain_synthesis.c',
+    '/media/libaom/src/aom_dsp/intrapred.c',
+    '/media/libaom/src/aom_dsp/loopfilter.c',
+    '/media/libaom/src/aom_dsp/subtract.c',
+    '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm',
+    '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '/media/libaom/src/aom_mem/aom_mem.c',
+    '/media/libaom/src/aom_ports/emms.asm',
+    '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '/media/libaom/src/aom_scale/generic/aom_scale.c',
+    '/media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '/media/libaom/src/aom_scale/generic/yv12config.c',
+    '/media/libaom/src/aom_scale/generic/yv12extend.c',
+    '/media/libaom/src/aom_util/aom_thread.c',
+    '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/av1_dx_iface.c',
+    '/media/libaom/src/av1/common/alloccommon.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '/media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '/media/libaom/src/av1/common/av1_loopfilter.c',
+    '/media/libaom/src/av1/common/av1_rtcd.c',
+    '/media/libaom/src/av1/common/av1_txfm.c',
+    '/media/libaom/src/av1/common/blockd.c',
+    '/media/libaom/src/av1/common/cdef.c',
+    '/media/libaom/src/av1/common/cdef_block.c',
+    '/media/libaom/src/av1/common/cdef_block_avx2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse2.c',
+    '/media/libaom/src/av1/common/cdef_block_sse4.c',
+    '/media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '/media/libaom/src/av1/common/cfl.c',
+    '/media/libaom/src/av1/common/convolve.c',
+    '/media/libaom/src/av1/common/debugmodes.c',
+    '/media/libaom/src/av1/common/entropy.c',
+    '/media/libaom/src/av1/common/entropymode.c',
+    '/media/libaom/src/av1/common/entropymv.c',
+    '/media/libaom/src/av1/common/frame_buffers.c',
+    '/media/libaom/src/av1/common/idct.c',
+    '/media/libaom/src/av1/common/mvref_common.c',
+    '/media/libaom/src/av1/common/obu_util.c',
+    '/media/libaom/src/av1/common/odintrin.c',
+    '/media/libaom/src/av1/common/pred_common.c',
+    '/media/libaom/src/av1/common/quant_common.c',
+    '/media/libaom/src/av1/common/reconinter.c',
+    '/media/libaom/src/av1/common/reconintra.c',
+    '/media/libaom/src/av1/common/resize.c',
+    '/media/libaom/src/av1/common/restoration.c',
+    '/media/libaom/src/av1/common/scale.c',
+    '/media/libaom/src/av1/common/scan.c',
+    '/media/libaom/src/av1/common/seg_common.c',
+    '/media/libaom/src/av1/common/thread_common.c',
+    '/media/libaom/src/av1/common/tile_common.c',
+    '/media/libaom/src/av1/common/timing.c',
+    '/media/libaom/src/av1/common/txb_common.c',
+    '/media/libaom/src/av1/common/warped_motion.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '/media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '/media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '/media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '/media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '/media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '/media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '/media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '/media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '/media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '/media/libaom/src/av1/decoder/decodeframe.c',
+    '/media/libaom/src/av1/decoder/decodemv.c',
+    '/media/libaom/src/av1/decoder/decoder.c',
+    '/media/libaom/src/av1/decoder/decodetxb.c',
+    '/media/libaom/src/av1/decoder/detokenize.c',
+    '/media/libaom/src/av1/decoder/dthread.c',
+    '/media/libaom/src/av1/decoder/obu.c',
   ],
 }
diff --git a/third_party/aom/.clang-format b/media/libaom/src/.clang-format
index e76a526e4..e76a526e4 100644
--- a/third_party/aom/.clang-format
+++ b/media/libaom/src/.clang-format
diff --git a/third_party/aom/.cmake-format.py b/media/libaom/src/.cmake-format.py
index aa7354c2a..aa7354c2a 100644
--- a/third_party/aom/.cmake-format.py
+++ b/media/libaom/src/.cmake-format.py
diff --git a/third_party/aom/.mailmap b/media/libaom/src/.mailmap
index bbe4525b1..bbe4525b1 100644
--- a/third_party/aom/.mailmap
+++ b/media/libaom/src/.mailmap
diff --git a/third_party/aom/AUTHORS b/media/libaom/src/AUTHORS
index 95c3c8bf2..95c3c8bf2 100644
--- a/third_party/aom/AUTHORS
+++ b/media/libaom/src/AUTHORS
diff --git a/third_party/aom/CHANGELOG b/media/libaom/src/CHANGELOG
index d84aa0249..d84aa0249 100644
--- a/third_party/aom/CHANGELOG
+++ b/media/libaom/src/CHANGELOG
diff --git a/third_party/aom/CMakeLists.txt b/media/libaom/src/CMakeLists.txt
index a58e54f40..a58e54f40 100644
--- a/third_party/aom/CMakeLists.txt
+++ b/media/libaom/src/CMakeLists.txt
diff --git a/third_party/aom/LICENSE b/media/libaom/src/LICENSE
index fc340c376..fc340c376 100644
--- a/third_party/aom/LICENSE
+++ b/media/libaom/src/LICENSE
diff --git a/third_party/aom/PATENTS b/media/libaom/src/PATENTS
index 97842e02f..97842e02f 100644
--- a/third_party/aom/PATENTS
+++ b/media/libaom/src/PATENTS
diff --git a/third_party/aom/README.md b/media/libaom/src/README.md
index cab3f9993..cab3f9993 100644
--- a/third_party/aom/README.md
+++ b/media/libaom/src/README.md
diff --git a/third_party/aom/aom/aom.h b/media/libaom/src/aom/aom.h
index b1cc1ecce..b1cc1ecce 100644
--- a/third_party/aom/aom/aom.h
+++ b/media/libaom/src/aom/aom.h
diff --git a/third_party/aom/aom/aom_codec.h b/media/libaom/src/aom/aom_codec.h
index fc0df5b9e..fc0df5b9e 100644
--- a/third_party/aom/aom/aom_codec.h
+++ b/media/libaom/src/aom/aom_codec.h
diff --git a/third_party/aom/aom/aom_decoder.h b/media/libaom/src/aom/aom_decoder.h
index 06c2dc5f7..06c2dc5f7 100644
--- a/third_party/aom/aom/aom_decoder.h
+++ b/media/libaom/src/aom/aom_decoder.h
diff --git a/third_party/aom/aom/aom_encoder.h b/media/libaom/src/aom/aom_encoder.h
index 0894ca9e3..0894ca9e3 100644
--- a/third_party/aom/aom/aom_encoder.h
+++ b/media/libaom/src/aom/aom_encoder.h
diff --git a/third_party/aom/aom/aom_frame_buffer.h b/media/libaom/src/aom/aom_frame_buffer.h
index fba4322f8..fba4322f8 100644
--- a/third_party/aom/aom/aom_frame_buffer.h
+++ b/media/libaom/src/aom/aom_frame_buffer.h
diff --git a/third_party/aom/aom/aom_image.h b/media/libaom/src/aom/aom_image.h
index a960127f1..a960127f1 100644
--- a/third_party/aom/aom/aom_image.h
+++ b/media/libaom/src/aom/aom_image.h
diff --git a/third_party/aom/aom/aom_integer.h b/media/libaom/src/aom/aom_integer.h
index 90263bd4f..90263bd4f 100644
--- a/third_party/aom/aom/aom_integer.h
+++ b/media/libaom/src/aom/aom_integer.h
diff --git a/third_party/aom/aom/aomcx.h b/media/libaom/src/aom/aomcx.h
index 013ddf57e..013ddf57e 100644
--- a/third_party/aom/aom/aomcx.h
+++ b/media/libaom/src/aom/aomcx.h
diff --git a/third_party/aom/aom/aomdx.h b/media/libaom/src/aom/aomdx.h
index 765856a1b..765856a1b 100644
--- a/third_party/aom/aom/aomdx.h
+++ b/media/libaom/src/aom/aomdx.h
diff --git a/third_party/aom/aom/exports_com b/media/libaom/src/aom/exports_com
index 2798bd51a..2798bd51a 100644
--- a/third_party/aom/aom/exports_com
+++ b/media/libaom/src/aom/exports_com
diff --git a/third_party/aom/aom/exports_dec b/media/libaom/src/aom/exports_dec
index d7d1c4f7d..d7d1c4f7d 100644
--- a/third_party/aom/aom/exports_dec
+++ b/media/libaom/src/aom/exports_dec
diff --git a/third_party/aom/aom/exports_enc b/media/libaom/src/aom/exports_enc
index 918d742f0..918d742f0 100644
--- a/third_party/aom/aom/exports_enc
+++ b/media/libaom/src/aom/exports_enc
diff --git a/third_party/aom/aom/exports_test b/media/libaom/src/aom/exports_test
index 01b864bae..01b864bae 100644
--- a/third_party/aom/aom/exports_test
+++ b/media/libaom/src/aom/exports_test
diff --git a/third_party/aom/aom/internal/aom_codec_internal.h b/media/libaom/src/aom/internal/aom_codec_internal.h
index 21c0dc69c..21c0dc69c 100644
--- a/third_party/aom/aom/internal/aom_codec_internal.h
+++ b/media/libaom/src/aom/internal/aom_codec_internal.h
diff --git a/third_party/aom/aom/src/aom_codec.c b/media/libaom/src/aom/src/aom_codec.c
index 733bffb25..733bffb25 100644
--- a/third_party/aom/aom/src/aom_codec.c
+++ b/media/libaom/src/aom/src/aom_codec.c
diff --git a/third_party/aom/aom/src/aom_decoder.c b/media/libaom/src/aom/src/aom_decoder.c
index 8c9111faf..8c9111faf 100644
--- a/third_party/aom/aom/src/aom_decoder.c
+++ b/media/libaom/src/aom/src/aom_decoder.c
diff --git a/third_party/aom/aom/src/aom_encoder.c b/media/libaom/src/aom/src/aom_encoder.c
index 523f40bbe..523f40bbe 100644
--- a/third_party/aom/aom/src/aom_encoder.c
+++ b/media/libaom/src/aom/src/aom_encoder.c
diff --git a/third_party/aom/aom/src/aom_image.c b/media/libaom/src/aom/src/aom_image.c
index 437f0241e..437f0241e 100644
--- a/third_party/aom/aom/src/aom_image.c
+++ b/media/libaom/src/aom/src/aom_image.c
diff --git a/third_party/aom/aom/src/aom_integer.c b/media/libaom/src/aom/src/aom_integer.c
index 7edfd0de8..7edfd0de8 100644
--- a/third_party/aom/aom/src/aom_integer.c
+++ b/media/libaom/src/aom/src/aom_integer.c
diff --git a/third_party/aom/aom_dsp/add_noise.c b/media/libaom/src/aom_dsp/add_noise.c
index bfb3e7e00..bfb3e7e00 100644
--- a/third_party/aom/aom_dsp/add_noise.c
+++ b/media/libaom/src/aom_dsp/add_noise.c
diff --git a/third_party/aom/aom_dsp/aom_convolve.c b/media/libaom/src/aom_dsp/aom_convolve.c
index 4791826da..4791826da 100644
--- a/third_party/aom/aom_dsp/aom_convolve.c
+++ b/media/libaom/src/aom_dsp/aom_convolve.c
diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/media/libaom/src/aom_dsp/aom_dsp.cmake
index 11ff73756..11ff73756 100644
--- a/third_party/aom/aom_dsp/aom_dsp.cmake
+++ b/media/libaom/src/aom_dsp/aom_dsp.cmake
diff --git a/third_party/aom/aom_dsp/aom_dsp_common.h b/media/libaom/src/aom_dsp/aom_dsp_common.h
index a185b23c8..a185b23c8 100644
--- a/third_party/aom/aom_dsp/aom_dsp_common.h
+++ b/media/libaom/src/aom_dsp/aom_dsp_common.h
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd.c b/media/libaom/src/aom_dsp/aom_dsp_rtcd.c
index 1514bd64e..1514bd64e 100644
--- a/third_party/aom/aom_dsp/aom_dsp_rtcd.c
+++ b/media/libaom/src/aom_dsp/aom_dsp_rtcd.c
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl b/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
index 8e8a480fe..8e8a480fe 100755..100644
--- a/third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
diff --git a/third_party/aom/aom_dsp/aom_filter.h b/media/libaom/src/aom_dsp/aom_filter.h
index 00686ac38..00686ac38 100644
--- a/third_party/aom/aom_dsp/aom_filter.h
+++ b/media/libaom/src/aom_dsp/aom_filter.h
diff --git a/third_party/aom/aom_dsp/aom_simd.h b/media/libaom/src/aom_dsp/aom_simd.h
index ab950ca55..ab950ca55 100644
--- a/third_party/aom/aom_dsp/aom_simd.h
+++ b/media/libaom/src/aom_dsp/aom_simd.h
diff --git a/third_party/aom/aom_dsp/aom_simd_inline.h b/media/libaom/src/aom_dsp/aom_simd_inline.h
index eb333f6f6..eb333f6f6 100644
--- a/third_party/aom/aom_dsp/aom_simd_inline.h
+++ b/media/libaom/src/aom_dsp/aom_simd_inline.h
diff --git a/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c b/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
index e7f08a5fd..e7f08a5fd 100644
--- a/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c
+++ b/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
diff --git a/third_party/aom/aom_dsp/arm/fwd_txfm_neon.c b/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
index e4300c992..e4300c992 100644
--- a/third_party/aom/aom_dsp/arm/fwd_txfm_neon.c
+++ b/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
diff --git a/third_party/aom/aom_dsp/arm/intrapred_neon.c b/media/libaom/src/aom_dsp/arm/intrapred_neon.c
index c85b1e910..c85b1e910 100644
--- a/third_party/aom/aom_dsp/arm/intrapred_neon.c
+++ b/media/libaom/src/aom_dsp/arm/intrapred_neon.c
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_neon.c b/media/libaom/src/aom_dsp/arm/loopfilter_neon.c
index bdc67626d..bdc67626d 100644
--- a/third_party/aom/aom_dsp/arm/loopfilter_neon.c
+++ b/media/libaom/src/aom_dsp/arm/loopfilter_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad4d_neon.c b/media/libaom/src/aom_dsp/arm/sad4d_neon.c
index 606950ab2..606950ab2 100644
--- a/third_party/aom/aom_dsp/arm/sad4d_neon.c
+++ b/media/libaom/src/aom_dsp/arm/sad4d_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad_neon.c b/media/libaom/src/aom_dsp/arm/sad_neon.c
index a39de91d6..a39de91d6 100644
--- a/third_party/aom/aom_dsp/arm/sad_neon.c
+++ b/media/libaom/src/aom_dsp/arm/sad_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subpel_variance_neon.c b/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
index cf618eee7..cf618eee7 100644
--- a/third_party/aom/aom_dsp/arm/subpel_variance_neon.c
+++ b/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subtract_neon.c b/media/libaom/src/aom_dsp/arm/subtract_neon.c
index 28f5ace8e..28f5ace8e 100644
--- a/third_party/aom/aom_dsp/arm/subtract_neon.c
+++ b/media/libaom/src/aom_dsp/arm/subtract_neon.c
diff --git a/third_party/aom/aom_dsp/arm/variance_neon.c b/media/libaom/src/aom_dsp/arm/variance_neon.c
index 74385a601..74385a601 100644
--- a/third_party/aom/aom_dsp/arm/variance_neon.c
+++ b/media/libaom/src/aom_dsp/arm/variance_neon.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.c b/media/libaom/src/aom_dsp/binary_codes_reader.c
index 01088010a..01088010a 100644
--- a/third_party/aom/aom_dsp/binary_codes_reader.c
+++ b/media/libaom/src/aom_dsp/binary_codes_reader.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.h b/media/libaom/src/aom_dsp/binary_codes_reader.h
index 364a67469..364a67469 100644
--- a/third_party/aom/aom_dsp/binary_codes_reader.h
+++ b/media/libaom/src/aom_dsp/binary_codes_reader.h
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.c b/media/libaom/src/aom_dsp/binary_codes_writer.c
index ee7a9f567..ee7a9f567 100644
--- a/third_party/aom/aom_dsp/binary_codes_writer.c
+++ b/media/libaom/src/aom_dsp/binary_codes_writer.c
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.h b/media/libaom/src/aom_dsp/binary_codes_writer.h
index c360e0e29..c360e0e29 100644
--- a/third_party/aom/aom_dsp/binary_codes_writer.h
+++ b/media/libaom/src/aom_dsp/binary_codes_writer.h
diff --git a/third_party/aom/aom_dsp/bitreader.h b/media/libaom/src/aom_dsp/bitreader.h
index 7c0efcc78..7c0efcc78 100644
--- a/third_party/aom/aom_dsp/bitreader.h
+++ b/media/libaom/src/aom_dsp/bitreader.h
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.c b/media/libaom/src/aom_dsp/bitreader_buffer.c
index b53211784..b53211784 100644
--- a/third_party/aom/aom_dsp/bitreader_buffer.c
+++ b/media/libaom/src/aom_dsp/bitreader_buffer.c
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.h b/media/libaom/src/aom_dsp/bitreader_buffer.h
index 725ca1ea2..725ca1ea2 100644
--- a/third_party/aom/aom_dsp/bitreader_buffer.h
+++ b/media/libaom/src/aom_dsp/bitreader_buffer.h
diff --git a/third_party/aom/aom_dsp/bitwriter.h b/media/libaom/src/aom_dsp/bitwriter.h
index b5ecc2382..b5ecc2382 100644
--- a/third_party/aom/aom_dsp/bitwriter.h
+++ b/media/libaom/src/aom_dsp/bitwriter.h
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.c b/media/libaom/src/aom_dsp/bitwriter_buffer.c
index 596246deb..596246deb 100644
--- a/third_party/aom/aom_dsp/bitwriter_buffer.c
+++ b/media/libaom/src/aom_dsp/bitwriter_buffer.c
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.h b/media/libaom/src/aom_dsp/bitwriter_buffer.h
index d0311284f..d0311284f 100644
--- a/third_party/aom/aom_dsp/bitwriter_buffer.h
+++ b/media/libaom/src/aom_dsp/bitwriter_buffer.h
diff --git a/third_party/aom/aom_dsp/blend.h b/media/libaom/src/aom_dsp/blend.h
index fd87dc181..fd87dc181 100644
--- a/third_party/aom/aom_dsp/blend.h
+++ b/media/libaom/src/aom_dsp/blend.h
diff --git a/third_party/aom/aom_dsp/blend_a64_hmask.c b/media/libaom/src/aom_dsp/blend_a64_hmask.c
index 0554b43d1..0554b43d1 100644
--- a/third_party/aom/aom_dsp/blend_a64_hmask.c
+++ b/media/libaom/src/aom_dsp/blend_a64_hmask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_mask.c b/media/libaom/src/aom_dsp/blend_a64_mask.c
index 992cc5c0c..992cc5c0c 100644
--- a/third_party/aom/aom_dsp/blend_a64_mask.c
+++ b/media/libaom/src/aom_dsp/blend_a64_mask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_vmask.c b/media/libaom/src/aom_dsp/blend_a64_vmask.c
index 4f222e17f..4f222e17f 100644
--- a/third_party/aom/aom_dsp/blend_a64_vmask.c
+++ b/media/libaom/src/aom_dsp/blend_a64_vmask.c
diff --git a/third_party/aom/aom_dsp/buf_ans.c b/media/libaom/src/aom_dsp/buf_ans.c
index f7703dffc..f7703dffc 100644
--- a/third_party/aom/aom_dsp/buf_ans.c
+++ b/media/libaom/src/aom_dsp/buf_ans.c
diff --git a/third_party/aom/aom_dsp/buf_ans.h b/media/libaom/src/aom_dsp/buf_ans.h
index 985fcdf9e..985fcdf9e 100644
--- a/third_party/aom/aom_dsp/buf_ans.h
+++ b/media/libaom/src/aom_dsp/buf_ans.h
diff --git a/third_party/aom/aom_dsp/daalaboolreader.c b/media/libaom/src/aom_dsp/daalaboolreader.c
index 6c2259f23..6c2259f23 100644
--- a/third_party/aom/aom_dsp/daalaboolreader.c
+++ b/media/libaom/src/aom_dsp/daalaboolreader.c
diff --git a/third_party/aom/aom_dsp/daalaboolreader.h b/media/libaom/src/aom_dsp/daalaboolreader.h
index ba78f916d..ba78f916d 100644
--- a/third_party/aom/aom_dsp/daalaboolreader.h
+++ b/media/libaom/src/aom_dsp/daalaboolreader.h
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.c b/media/libaom/src/aom_dsp/daalaboolwriter.c
index b24ffbf3f..b24ffbf3f 100644
--- a/third_party/aom/aom_dsp/daalaboolwriter.c
+++ b/media/libaom/src/aom_dsp/daalaboolwriter.c
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.h b/media/libaom/src/aom_dsp/daalaboolwriter.h
index 3848877ce..3848877ce 100644
--- a/third_party/aom/aom_dsp/daalaboolwriter.h
+++ b/media/libaom/src/aom_dsp/daalaboolwriter.h
diff --git a/third_party/aom/aom_dsp/entcode.c b/media/libaom/src/aom_dsp/entcode.c
index aad96c6fc..aad96c6fc 100644
--- a/third_party/aom/aom_dsp/entcode.c
+++ b/media/libaom/src/aom_dsp/entcode.c
diff --git a/third_party/aom/aom_dsp/entcode.h b/media/libaom/src/aom_dsp/entcode.h
index 7ba2b1c39..7ba2b1c39 100644
--- a/third_party/aom/aom_dsp/entcode.h
+++ b/media/libaom/src/aom_dsp/entcode.h
diff --git a/third_party/aom/aom_dsp/entdec.c b/media/libaom/src/aom_dsp/entdec.c
index d1764c47b..d1764c47b 100644
--- a/third_party/aom/aom_dsp/entdec.c
+++ b/media/libaom/src/aom_dsp/entdec.c
diff --git a/third_party/aom/aom_dsp/entdec.h b/media/libaom/src/aom_dsp/entdec.h
index 283bf1831..283bf1831 100644
--- a/third_party/aom/aom_dsp/entdec.h
+++ b/media/libaom/src/aom_dsp/entdec.h
diff --git a/third_party/aom/aom_dsp/entenc.c b/media/libaom/src/aom_dsp/entenc.c
index a61da263c..a61da263c 100644
--- a/third_party/aom/aom_dsp/entenc.c
+++ b/media/libaom/src/aom_dsp/entenc.c
diff --git a/third_party/aom/aom_dsp/entenc.h b/media/libaom/src/aom_dsp/entenc.h
index 3551d4250..3551d4250 100644
--- a/third_party/aom/aom_dsp/entenc.h
+++ b/media/libaom/src/aom_dsp/entenc.h
diff --git a/third_party/aom/aom_dsp/fastssim.c b/media/libaom/src/aom_dsp/fastssim.c
index 3804519b3..3804519b3 100644
--- a/third_party/aom/aom_dsp/fastssim.c
+++ b/media/libaom/src/aom_dsp/fastssim.c
diff --git a/third_party/aom/aom_dsp/fft.c b/media/libaom/src/aom_dsp/fft.c
index 0ba71cfb3..0ba71cfb3 100644
--- a/third_party/aom/aom_dsp/fft.c
+++ b/media/libaom/src/aom_dsp/fft.c
diff --git a/third_party/aom/aom_dsp/fft_common.h b/media/libaom/src/aom_dsp/fft_common.h
index 5137331ae..5137331ae 100644
--- a/third_party/aom/aom_dsp/fft_common.h
+++ b/media/libaom/src/aom_dsp/fft_common.h
diff --git a/third_party/aom/aom_dsp/fwd_txfm.c b/media/libaom/src/aom_dsp/fwd_txfm.c
index e50f951c1..e50f951c1 100644
--- a/third_party/aom/aom_dsp/fwd_txfm.c
+++ b/media/libaom/src/aom_dsp/fwd_txfm.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.c b/media/libaom/src/aom_dsp/grain_synthesis.c
index b96e1c319..b96e1c319 100644
--- a/third_party/aom/aom_dsp/grain_synthesis.c
+++ b/media/libaom/src/aom_dsp/grain_synthesis.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.h b/media/libaom/src/aom_dsp/grain_synthesis.h
index 7aee6f6f4..7aee6f6f4 100644
--- a/third_party/aom/aom_dsp/grain_synthesis.h
+++ b/media/libaom/src/aom_dsp/grain_synthesis.h
diff --git a/third_party/aom/aom_dsp/grain_table.c b/media/libaom/src/aom_dsp/grain_table.c
index 0d6a73f55..0d6a73f55 100644
--- a/third_party/aom/aom_dsp/grain_table.c
+++ b/media/libaom/src/aom_dsp/grain_table.c
diff --git a/third_party/aom/aom_dsp/grain_table.h b/media/libaom/src/aom_dsp/grain_table.h
index a8ac50730..a8ac50730 100644
--- a/third_party/aom/aom_dsp/grain_table.h
+++ b/media/libaom/src/aom_dsp/grain_table.h
diff --git a/third_party/aom/aom_dsp/intrapred.c b/media/libaom/src/aom_dsp/intrapred.c
index c6aa6b207..c6aa6b207 100644
--- a/third_party/aom/aom_dsp/intrapred.c
+++ b/media/libaom/src/aom_dsp/intrapred.c
diff --git a/third_party/aom/aom_dsp/intrapred_common.h b/media/libaom/src/aom_dsp/intrapred_common.h
index 3ec62a86e..3ec62a86e 100644
--- a/third_party/aom/aom_dsp/intrapred_common.h
+++ b/media/libaom/src/aom_dsp/intrapred_common.h
diff --git a/third_party/aom/aom_dsp/loopfilter.c b/media/libaom/src/aom_dsp/loopfilter.c
index a3f261824..a3f261824 100644
--- a/third_party/aom/aom_dsp/loopfilter.c
+++ b/media/libaom/src/aom_dsp/loopfilter.c
diff --git a/third_party/aom/aom_dsp/mips/add_noise_msa.c b/media/libaom/src/aom_dsp/mips/add_noise_msa.c
index 96d04cff0..96d04cff0 100644
--- a/third_party/aom/aom_dsp/mips/add_noise_msa.c
+++ b/media/libaom/src/aom_dsp/mips/add_noise_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
index 363fad308..363fad308 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c
+++ b/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
index aa962b41f..aa962b41f 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c
+++ b/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
index f7f116f4d..f7f116f4d 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c
+++ b/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_msa.h b/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
index 852415c20..852415c20 100644
--- a/third_party/aom/aom_dsp/mips/aom_convolve_msa.h
+++ b/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.c b/media/libaom/src/aom_dsp/mips/common_dspr2.c
index 00ab75dc3..00ab75dc3 100644
--- a/third_party/aom/aom_dsp/mips/common_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/common_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.h b/media/libaom/src/aom_dsp/mips/common_dspr2.h
index c42188d62..c42188d62 100644
--- a/third_party/aom/aom_dsp/mips/common_dspr2.h
+++ b/media/libaom/src/aom_dsp/mips/common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/convolve2_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
index 08bf1ab30..08bf1ab30 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
index 097da73ca..097da73ca 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
index 40abfd89e..40abfd89e 100644
--- a/third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
index af54b4264..af54b4264 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
index f9c6879ab..f9c6879ab 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
index 201e66427..201e66427 100644
--- a/third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve_common_dspr2.h b/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
index e5d48a884..e5d48a884 100644
--- a/third_party/aom/aom_dsp/mips/convolve_common_dspr2.h
+++ b/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/intrapred16_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
index 7c221ae89..7c221ae89 100644
--- a/third_party/aom/aom_dsp/mips/intrapred16_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred4_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
index 0a21979c7..0a21979c7 100644
--- a/third_party/aom/aom_dsp/mips/intrapred4_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred8_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
index d42a77c80..d42a77c80 100644
--- a/third_party/aom/aom_dsp/mips/intrapred8_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred_msa.c b/media/libaom/src/aom_dsp/mips/intrapred_msa.c
index 9f25cc1ca..9f25cc1ca 100644
--- a/third_party/aom/aom_dsp/mips/intrapred_msa.c
+++ b/media/libaom/src/aom_dsp/mips/intrapred_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_16_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
index 38a10e9b2..38a10e9b2 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_16_msa.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_4_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
index dc0a97764..dc0a97764 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_4_msa.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_8_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
index dc203e79c..dc203e79c 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_8_msa.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
index 8c41278be..8c41278be 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
index 28f0dc35a..28f0dc35a 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
index 62295d69d..62295d69d 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
index a0f57f386..a0f57f386 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
index b67ccfe9d..b67ccfe9d 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
index 34733e42e..34733e42e 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
index 3d3f1ec97..3d3f1ec97 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_msa.h b/media/libaom/src/aom_dsp/mips/loopfilter_msa.h
index 54b0bb4bd..54b0bb4bd 100644
--- a/third_party/aom/aom_dsp/mips/loopfilter_msa.h
+++ b/media/libaom/src/aom_dsp/mips/loopfilter_msa.h
diff --git a/third_party/aom/aom_dsp/mips/macros_msa.h b/media/libaom/src/aom_dsp/mips/macros_msa.h
index 9bfc27147..9bfc27147 100644
--- a/third_party/aom/aom_dsp/mips/macros_msa.h
+++ b/media/libaom/src/aom_dsp/mips/macros_msa.h
diff --git a/third_party/aom/aom_dsp/mips/sad_msa.c b/media/libaom/src/aom_dsp/mips/sad_msa.c
index 58cdd80d9..58cdd80d9 100644
--- a/third_party/aom/aom_dsp/mips/sad_msa.c
+++ b/media/libaom/src/aom_dsp/mips/sad_msa.c
diff --git a/third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c b/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
index 810b6efaa..810b6efaa 100644
--- a/third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c
+++ b/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
diff --git a/third_party/aom/aom_dsp/mips/subtract_msa.c b/media/libaom/src/aom_dsp/mips/subtract_msa.c
index bfed773ac..bfed773ac 100644
--- a/third_party/aom/aom_dsp/mips/subtract_msa.c
+++ b/media/libaom/src/aom_dsp/mips/subtract_msa.c
diff --git a/third_party/aom/aom_dsp/mips/variance_msa.c b/media/libaom/src/aom_dsp/mips/variance_msa.c
index 065c09ac5..065c09ac5 100644
--- a/third_party/aom/aom_dsp/mips/variance_msa.c
+++ b/media/libaom/src/aom_dsp/mips/variance_msa.c
diff --git a/third_party/aom/aom_dsp/noise_model.c b/media/libaom/src/aom_dsp/noise_model.c
index 2faee8506..2faee8506 100644
--- a/third_party/aom/aom_dsp/noise_model.c
+++ b/media/libaom/src/aom_dsp/noise_model.c
diff --git a/third_party/aom/aom_dsp/noise_model.h b/media/libaom/src/aom_dsp/noise_model.h
index 049d5be15..049d5be15 100644
--- a/third_party/aom/aom_dsp/noise_model.h
+++ b/media/libaom/src/aom_dsp/noise_model.h
diff --git a/third_party/aom/aom_dsp/noise_util.c b/media/libaom/src/aom_dsp/noise_util.c
index 87e8e9fec..87e8e9fec 100644
--- a/third_party/aom/aom_dsp/noise_util.c
+++ b/media/libaom/src/aom_dsp/noise_util.c
diff --git a/third_party/aom/aom_dsp/noise_util.h b/media/libaom/src/aom_dsp/noise_util.h
index 2284a171a..2284a171a 100644
--- a/third_party/aom/aom_dsp/noise_util.h
+++ b/media/libaom/src/aom_dsp/noise_util.h
diff --git a/third_party/aom/aom_dsp/postproc.h b/media/libaom/src/aom_dsp/postproc.h
index f3d87f264..f3d87f264 100644
--- a/third_party/aom/aom_dsp/postproc.h
+++ b/media/libaom/src/aom_dsp/postproc.h
diff --git a/third_party/aom/aom_dsp/prob.h b/media/libaom/src/aom_dsp/prob.h
index d003a986e..d003a986e 100644
--- a/third_party/aom/aom_dsp/prob.h
+++ b/media/libaom/src/aom_dsp/prob.h
diff --git a/third_party/aom/aom_dsp/psnr.c b/media/libaom/src/aom_dsp/psnr.c
index 50f376a4a..50f376a4a 100644
--- a/third_party/aom/aom_dsp/psnr.c
+++ b/media/libaom/src/aom_dsp/psnr.c
diff --git a/third_party/aom/aom_dsp/psnr.h b/media/libaom/src/aom_dsp/psnr.h
index 58e4e71ee..58e4e71ee 100644
--- a/third_party/aom/aom_dsp/psnr.h
+++ b/media/libaom/src/aom_dsp/psnr.h
diff --git a/third_party/aom/aom_dsp/psnrhvs.c b/media/libaom/src/aom_dsp/psnrhvs.c
index 30fe21d9c..30fe21d9c 100644
--- a/third_party/aom/aom_dsp/psnrhvs.c
+++ b/media/libaom/src/aom_dsp/psnrhvs.c
diff --git a/third_party/aom/aom_dsp/quantize.c b/media/libaom/src/aom_dsp/quantize.c
index 62dbd86a9..62dbd86a9 100644
--- a/third_party/aom/aom_dsp/quantize.c
+++ b/media/libaom/src/aom_dsp/quantize.c
diff --git a/third_party/aom/aom_dsp/quantize.h b/media/libaom/src/aom_dsp/quantize.h
index c55ab234e..c55ab234e 100644
--- a/third_party/aom/aom_dsp/quantize.h
+++ b/media/libaom/src/aom_dsp/quantize.h
diff --git a/third_party/aom/aom_dsp/sad.c b/media/libaom/src/aom_dsp/sad.c
index 1e24df4a5..1e24df4a5 100644
--- a/third_party/aom/aom_dsp/sad.c
+++ b/media/libaom/src/aom_dsp/sad.c
diff --git a/third_party/aom/aom_dsp/sad_av1.c b/media/libaom/src/aom_dsp/sad_av1.c
index c176001d6..c176001d6 100644
--- a/third_party/aom/aom_dsp/sad_av1.c
+++ b/media/libaom/src/aom_dsp/sad_av1.c
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics.h
index 01dbb8fd2..01dbb8fd2 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics.h
+++ b/media/libaom/src/aom_dsp/simd/v128_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
index 3c669d579..3c669d579 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h
+++ b/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
index bbe9a9d28..bbe9a9d28 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_c.h
+++ b/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
index 6c7241ff4..6c7241ff4 100644
--- a/third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h
+++ b/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics.h
index cb99d35b7..cb99d35b7 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics.h
+++ b/media/libaom/src/aom_dsp/simd/v256_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
index bd86ea172..bd86ea172 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h
+++ b/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
index a1c08e95a..a1c08e95a 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_c.h
+++ b/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
index d5b7905ef..d5b7905ef 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h
+++ b/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
index 44594bc41..44594bc41 100644
--- a/third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h
+++ b/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics.h
index afc55428d..afc55428d 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics.h
+++ b/media/libaom/src/aom_dsp/simd/v64_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
index 8f39ad6e8..8f39ad6e8 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h
+++ b/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
index 028d68c4f..028d68c4f 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_c.h
+++ b/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
index 5f9a57b37..5f9a57b37 100644
--- a/third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h
+++ b/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/sse.c b/media/libaom/src/aom_dsp/sse.c
index 249394807..249394807 100644
--- a/third_party/aom/aom_dsp/sse.c
+++ b/media/libaom/src/aom_dsp/sse.c
diff --git a/third_party/aom/aom_dsp/ssim.c b/media/libaom/src/aom_dsp/ssim.c
index 681770ba9..681770ba9 100644
--- a/third_party/aom/aom_dsp/ssim.c
+++ b/media/libaom/src/aom_dsp/ssim.c
diff --git a/third_party/aom/aom_dsp/ssim.h b/media/libaom/src/aom_dsp/ssim.h
index 55038f4c2..55038f4c2 100644
--- a/third_party/aom/aom_dsp/ssim.h
+++ b/media/libaom/src/aom_dsp/ssim.h
diff --git a/third_party/aom/aom_dsp/subtract.c b/media/libaom/src/aom_dsp/subtract.c
index 2f6da96e5..2f6da96e5 100644
--- a/third_party/aom/aom_dsp/subtract.c
+++ b/media/libaom/src/aom_dsp/subtract.c
diff --git a/third_party/aom/aom_dsp/sum_squares.c b/media/libaom/src/aom_dsp/sum_squares.c
index 44ec41f2e..44ec41f2e 100644
--- a/third_party/aom/aom_dsp/sum_squares.c
+++ b/media/libaom/src/aom_dsp/sum_squares.c
diff --git a/third_party/aom/aom_dsp/txfm_common.h b/media/libaom/src/aom_dsp/txfm_common.h
index f98242840..f98242840 100644
--- a/third_party/aom/aom_dsp/txfm_common.h
+++ b/media/libaom/src/aom_dsp/txfm_common.h
diff --git a/third_party/aom/aom_dsp/variance.c b/media/libaom/src/aom_dsp/variance.c
index 23b715309..23b715309 100644
--- a/third_party/aom/aom_dsp/variance.c
+++ b/media/libaom/src/aom_dsp/variance.c
diff --git a/third_party/aom/aom_dsp/variance.h b/media/libaom/src/aom_dsp/variance.h
index 362da29d3..362da29d3 100644
--- a/third_party/aom/aom_dsp/variance.h
+++ b/media/libaom/src/aom_dsp/variance.h
diff --git a/third_party/aom/aom_dsp/x86/aom_asm_stubs.c b/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
index 5f5bf5f14..5f5bf5f14 100644
--- a/third_party/aom/aom_dsp/x86/aom_asm_stubs.c
+++ b/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
diff --git a/third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
index 7283c32b8..7283c32b8 100644
--- a/third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
index b6f040791..b6f040791 100644
--- a/third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
index 7b3fe6419..7b3fe6419 100644
--- a/third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
index 94b5da171..94b5da171 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
index 325a21b76..325a21b76 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
index c88fc9ffb..c88fc9ffb 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
index 3ca7921b6..3ca7921b6 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
index d0b4b2839..d0b4b2839 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
index 59edc49a9..59edc49a9 100644
--- a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
+++ b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
index 4f5e3f8c1..4f5e3f8c1 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
index 67fb4d32b..67fb4d32b 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
index 9d6b4c2f7..9d6b4c2f7 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
index 064910232..064910232 100644
--- a/third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_mask_sse4.h b/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
index c071fdcfc..c071fdcfc 100644
--- a/third_party/aom/aom_dsp/x86/blend_mask_sse4.h
+++ b/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/blend_sse4.h b/media/libaom/src/aom_dsp/x86/blend_sse4.h
index 8d9b32510..8d9b32510 100644
--- a/third_party/aom/aom_dsp/x86/blend_sse4.h
+++ b/media/libaom/src/aom_dsp/x86/blend_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/common_avx2.h b/media/libaom/src/aom_dsp/x86/common_avx2.h
index 96fe4ebb6..96fe4ebb6 100644
--- a/third_party/aom/aom_dsp/x86/common_avx2.h
+++ b/media/libaom/src/aom_dsp/x86/common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve.h b/media/libaom/src/aom_dsp/x86/convolve.h
index 3e19682cd..3e19682cd 100644
--- a/third_party/aom/aom_dsp/x86/convolve.h
+++ b/media/libaom/src/aom_dsp/x86/convolve.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_avx2.h b/media/libaom/src/aom_dsp/x86/convolve_avx2.h
index 30253f65c..30253f65c 100644
--- a/third_party/aom/aom_dsp/x86/convolve_avx2.h
+++ b/media/libaom/src/aom_dsp/x86/convolve_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_common_intrin.h b/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
index 707bd2d78..707bd2d78 100644
--- a/third_party/aom/aom_dsp/x86/convolve_common_intrin.h
+++ b/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse2.h b/media/libaom/src/aom_dsp/x86/convolve_sse2.h
index 445d04b10..445d04b10 100644
--- a/third_party/aom/aom_dsp/x86/convolve_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/convolve_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse4_1.h b/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
index 6b8388d84..6b8388d84 100644
--- a/third_party/aom/aom_dsp/x86/convolve_sse4_1.h
+++ b/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
diff --git a/third_party/aom/aom_dsp/x86/fft_avx2.c b/media/libaom/src/aom_dsp/x86/fft_avx2.c
index 54da02253..54da02253 100644
--- a/third_party/aom/aom_dsp/x86/fft_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/fft_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/fft_sse2.c b/media/libaom/src/aom_dsp/x86/fft_sse2.c
index 12bdc3e18..12bdc3e18 100644
--- a/third_party/aom/aom_dsp/x86/fft_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/fft_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
index 1e3d13ec8..1e3d13ec8 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
index 2d8f8f71e..2d8f8f71e 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
index 260d8dd58..260d8dd58 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
index c1fb259a1..c1fb259a1 100644
--- a/third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
+++ b/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
index 099fcf7fc..099fcf7fc 100644
--- a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
index e7b33d1c4..e7b33d1c4 100644
--- a/third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
index 5a55736c4..5a55736c4 100644
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
index 91b3d126c..91b3d126c 100644
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
+++ b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
index c954da94e..c954da94e 100644
--- a/third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
index 097e0778f..097e0778f 100644
--- a/third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
index b9689202a..b9689202a 100644
--- a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
index 58e5f98e5..58e5f98e5 100644
--- a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
index e0d22522d..e0d22522d 100644
--- a/third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
index 3398d8a2a..3398d8a2a 100644
--- a/third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
index 61f5b8e86..61f5b8e86 100644
--- a/third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
index 18eb03d12..18eb03d12 100644
--- a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
index 9b1b4c9de..9b1b4c9de 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
index 0d954e178..0d954e178 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
index 47b052abc..47b052abc 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse4.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
index df5449a9d..df5449a9d 100644
--- a/third_party/aom/aom_dsp/x86/highbd_variance_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_avx2.c b/media/libaom/src/aom_dsp/x86/intrapred_avx2.c
index 1e67d392e..1e67d392e 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/intrapred_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/intrapred_sse2.c
index 5b2452c8e..5b2452c8e 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm b/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm
index 9aece27be..9aece27be 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
+++ b/media/libaom/src/aom_dsp/x86/intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/intrapred_ssse3.c b/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
index 807ed1770..807ed1770 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/inv_wht_sse2.asm b/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
index 0bc841a7a..0bc841a7a 100644
--- a/third_party/aom/aom_dsp/x86/inv_wht_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
index c3c88245a..c3c88245a 100644
--- a/third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
index f9a41a210..f9a41a210 100644
--- a/third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
index 9d88b5e49..9d88b5e49 100644
--- a/third_party/aom/aom_dsp/x86/loopfilter_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/lpf_common_sse2.h b/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
index 8970fe7dd..8970fe7dd 100644
--- a/third_party/aom/aom_dsp/x86/lpf_common_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
index 584b5e7e3..584b5e7e3 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
index 493f9bd8f..493f9bd8f 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
index cffbd9672..cffbd9672 100644
--- a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h
+++ b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
index d7dbefd7d..d7dbefd7d 100644
--- a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
index 4faa098ac..4faa098ac 100644
--- a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h
+++ b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/mem_sse2.h b/media/libaom/src/aom_dsp/x86/mem_sse2.h
index 6c821673e..6c821673e 100644
--- a/third_party/aom/aom_dsp/x86/mem_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/mem_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
index 5181e444c..5181e444c 100644
--- a/third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h
+++ b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
index 48486c6c4..48486c6c4 100644
--- a/third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h
+++ b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
index 2aa2a0555..2aa2a0555 100644
--- a/third_party/aom/aom_dsp/x86/obmc_sad_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
index 0338a8c77..0338a8c77 100644
--- a/third_party/aom/aom_dsp/x86/obmc_sad_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
index bfec0e8a8..bfec0e8a8 100644
--- a/third_party/aom/aom_dsp/x86/obmc_variance_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
index 72eda0e57..72eda0e57 100644
--- a/third_party/aom/aom_dsp/x86/obmc_variance_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
index 216a0bd8f..216a0bd8f 100644
--- a/third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm
+++ b/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_sse2.c b/media/libaom/src/aom_dsp/x86/quantize_sse2.c
index d3de6e24d..d3de6e24d 100644
--- a/third_party/aom/aom_dsp/x86/quantize_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/quantize_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
index 39d4ca674..39d4ca674 100644
--- a/third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm
+++ b/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_x86.h b/media/libaom/src/aom_dsp/x86/quantize_x86.h
index 4eed7dd29..4eed7dd29 100644
--- a/third_party/aom/aom_dsp/x86/quantize_x86.h
+++ b/media/libaom/src/aom_dsp/x86/quantize_x86.h
diff --git a/third_party/aom/aom_dsp/x86/sad4d_avx2.c b/media/libaom/src/aom_dsp/x86/sad4d_avx2.c
index f662b62b1..f662b62b1 100644
--- a/third_party/aom/aom_dsp/x86/sad4d_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sad4d_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
index 55a856985..55a856985 100644
--- a/third_party/aom/aom_dsp/x86/sad4d_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sad_avx2.c b/media/libaom/src/aom_dsp/x86/sad_avx2.c
index a50dba64a..a50dba64a 100644
--- a/third_party/aom/aom_dsp/x86/sad_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_highbd_avx2.c b/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
index b506d4663..b506d4663 100644
--- a/third_party/aom/aom_dsp/x86/sad_highbd_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_impl_avx2.c b/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
index c6fd62c9e..c6fd62c9e 100644
--- a/third_party/aom/aom_dsp/x86/sad_impl_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_sse2.asm b/media/libaom/src/aom_dsp/x86/sad_sse2.asm
index 3251b7655..3251b7655 100644
--- a/third_party/aom/aom_dsp/x86/sad_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sse_avx2.c b/media/libaom/src/aom_dsp/x86/sse_avx2.c
index 305dde5c0..305dde5c0 100644
--- a/third_party/aom/aom_dsp/x86/sse_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sse_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sse_sse4.c b/media/libaom/src/aom_dsp/x86/sse_sse4.c
index 8b5af8469..8b5af8469 100644
--- a/third_party/aom/aom_dsp/x86/sse_sse4.c
+++ b/media/libaom/src/aom_dsp/x86/sse_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm b/media/libaom/src/aom_dsp/x86/ssim_opt_x86_64.asm
index 6d9b5a12f..6d9b5a12f 100644
--- a/third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm
+++ b/media/libaom/src/aom_dsp/x86/ssim_opt_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm b/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
index 45bf6ec3c..45bf6ec3c 100644
--- a/third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/subtract_avx2.c b/media/libaom/src/aom_dsp/x86/subtract_avx2.c
index 4389d123d..4389d123d 100644
--- a/third_party/aom/aom_dsp/x86/subtract_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/subtract_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/subtract_sse2.asm b/media/libaom/src/aom_dsp/x86/subtract_sse2.asm
index 1a75a234f..1a75a234f 100644
--- a/third_party/aom/aom_dsp/x86/subtract_sse2.asm
+++ b/media/libaom/src/aom_dsp/x86/subtract_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_avx2.c b/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
index 0af44e3a4..0af44e3a4 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.c b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
index 22d7739ec..22d7739ec 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.h b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
index 491e31cc5..491e31cc5 100644
--- a/third_party/aom/aom_dsp/x86/sum_squares_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms.h b/media/libaom/src/aom_dsp/x86/synonyms.h
index 1e9f1e27b..1e9f1e27b 100644
--- a/third_party/aom/aom_dsp/x86/synonyms.h
+++ b/media/libaom/src/aom_dsp/x86/synonyms.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms_avx2.h b/media/libaom/src/aom_dsp/x86/synonyms_avx2.h
index 3f69b120e..3f69b120e 100644
--- a/third_party/aom/aom_dsp/x86/synonyms_avx2.h
+++ b/media/libaom/src/aom_dsp/x86/synonyms_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/transpose_sse2.h b/media/libaom/src/aom_dsp/x86/transpose_sse2.h
index d0d1ee684..d0d1ee684 100644
--- a/third_party/aom/aom_dsp/x86/transpose_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/transpose_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_avx2.h b/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
index b1611ba87..b1611ba87 100644
--- a/third_party/aom/aom_dsp/x86/txfm_common_avx2.h
+++ b/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_sse2.h b/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
index ed82eee96..ed82eee96 100644
--- a/third_party/aom/aom_dsp/x86/txfm_common_sse2.h
+++ b/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/variance_avx2.c b/media/libaom/src/aom_dsp/x86/variance_avx2.c
index 800aef126..800aef126 100644
--- a/third_party/aom/aom_dsp/x86/variance_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_avx2.c b/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
index 88e27aef3..88e27aef3 100644
--- a/third_party/aom/aom_dsp/x86/variance_impl_avx2.c
+++ b/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_ssse3.c b/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
index 66b0d7d84..66b0d7d84 100644
--- a/third_party/aom/aom_dsp/x86/variance_impl_ssse3.c
+++ b/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/variance_sse2.c b/media/libaom/src/aom_dsp/x86/variance_sse2.c
index 3c37e77c0..3c37e77c0 100644
--- a/third_party/aom/aom_dsp/x86/variance_sse2.c
+++ b/media/libaom/src/aom_dsp/x86/variance_sse2.c
diff --git a/third_party/aom/aom_mem/aom_mem.c b/media/libaom/src/aom_mem/aom_mem.c
index e603fc5bf..e603fc5bf 100644
--- a/third_party/aom/aom_mem/aom_mem.c
+++ b/media/libaom/src/aom_mem/aom_mem.c
diff --git a/third_party/aom/aom_mem/aom_mem.cmake b/media/libaom/src/aom_mem/aom_mem.cmake
index eaee8440b..eaee8440b 100644
--- a/third_party/aom/aom_mem/aom_mem.cmake
+++ b/media/libaom/src/aom_mem/aom_mem.cmake
diff --git a/third_party/aom/aom_mem/aom_mem.h b/media/libaom/src/aom_mem/aom_mem.h
index 4b1fa45f1..4b1fa45f1 100644
--- a/third_party/aom/aom_mem/aom_mem.h
+++ b/media/libaom/src/aom_mem/aom_mem.h
diff --git a/third_party/aom/aom_mem/include/aom_mem_intrnl.h b/media/libaom/src/aom_mem/include/aom_mem_intrnl.h
index cbc30a9bb..cbc30a9bb 100644
--- a/third_party/aom/aom_mem/include/aom_mem_intrnl.h
+++ b/media/libaom/src/aom_mem/include/aom_mem_intrnl.h
diff --git a/third_party/aom/aom_ports/aom_once.h b/media/libaom/src/aom_ports/aom_once.h
index 4d77aac5a..4d77aac5a 100644
--- a/third_party/aom/aom_ports/aom_once.h
+++ b/media/libaom/src/aom_ports/aom_once.h
diff --git a/third_party/aom/aom_ports/aom_ports.cmake b/media/libaom/src/aom_ports/aom_ports.cmake
index 6272fc0e3..6272fc0e3 100644
--- a/third_party/aom/aom_ports/aom_ports.cmake
+++ b/media/libaom/src/aom_ports/aom_ports.cmake
diff --git a/third_party/aom/aom_ports/aom_timer.h b/media/libaom/src/aom_ports/aom_timer.h
index 9b17b8983..9b17b8983 100644
--- a/third_party/aom/aom_ports/aom_timer.h
+++ b/media/libaom/src/aom_ports/aom_timer.h
diff --git a/third_party/aom/aom_ports/arm.h b/media/libaom/src/aom_ports/arm.h
index cb1fb9bec..cb1fb9bec 100644
--- a/third_party/aom/aom_ports/arm.h
+++ b/media/libaom/src/aom_ports/arm.h
diff --git a/third_party/aom/aom_ports/arm_cpudetect.c b/media/libaom/src/aom_ports/arm_cpudetect.c
index 5a75bb348..5a75bb348 100644
--- a/third_party/aom/aom_ports/arm_cpudetect.c
+++ b/media/libaom/src/aom_ports/arm_cpudetect.c
diff --git a/third_party/aom/aom_ports/bitops.h b/media/libaom/src/aom_ports/bitops.h
index 44df17307..44df17307 100644
--- a/third_party/aom/aom_ports/bitops.h
+++ b/media/libaom/src/aom_ports/bitops.h
diff --git a/third_party/aom/aom_ports/emmintrin_compat.h b/media/libaom/src/aom_ports/emmintrin_compat.h
index 85d218a3d..85d218a3d 100644
--- a/third_party/aom/aom_ports/emmintrin_compat.h
+++ b/media/libaom/src/aom_ports/emmintrin_compat.h
diff --git a/third_party/aom/aom_ports/emms.asm b/media/libaom/src/aom_ports/emms.asm
index 90776bacb..90776bacb 100644
--- a/third_party/aom/aom_ports/emms.asm
+++ b/media/libaom/src/aom_ports/emms.asm
diff --git a/third_party/aom/aom_ports/mem.h b/media/libaom/src/aom_ports/mem.h
index 3ffea3cd6..3ffea3cd6 100644
--- a/third_party/aom/aom_ports/mem.h
+++ b/media/libaom/src/aom_ports/mem.h
diff --git a/third_party/aom/aom_ports/mem_ops.h b/media/libaom/src/aom_ports/mem_ops.h
index 2b5bc0f0f..2b5bc0f0f 100644
--- a/third_party/aom/aom_ports/mem_ops.h
+++ b/media/libaom/src/aom_ports/mem_ops.h
diff --git a/third_party/aom/aom_ports/mem_ops_aligned.h b/media/libaom/src/aom_ports/mem_ops_aligned.h
index 37c367531..37c367531 100644
--- a/third_party/aom/aom_ports/mem_ops_aligned.h
+++ b/media/libaom/src/aom_ports/mem_ops_aligned.h
diff --git a/third_party/aom/aom_ports/msvc.h b/media/libaom/src/aom_ports/msvc.h
index e78e605f2..e78e605f2 100644
--- a/third_party/aom/aom_ports/msvc.h
+++ b/media/libaom/src/aom_ports/msvc.h
diff --git a/third_party/aom/aom_ports/ppc.h b/media/libaom/src/aom_ports/ppc.h
index 3159bda68..3159bda68 100644
--- a/third_party/aom/aom_ports/ppc.h
+++ b/media/libaom/src/aom_ports/ppc.h
diff --git a/third_party/aom/aom_ports/ppc_cpudetect.c b/media/libaom/src/aom_ports/ppc_cpudetect.c
index 82b4f58cc..82b4f58cc 100644
--- a/third_party/aom/aom_ports/ppc_cpudetect.c
+++ b/media/libaom/src/aom_ports/ppc_cpudetect.c
diff --git a/third_party/aom/aom_ports/sanitizer.h b/media/libaom/src/aom_ports/sanitizer.h
index 1dd8eb4cf..1dd8eb4cf 100644
--- a/third_party/aom/aom_ports/sanitizer.h
+++ b/media/libaom/src/aom_ports/sanitizer.h
diff --git a/third_party/aom/aom_ports/system_state.h b/media/libaom/src/aom_ports/system_state.h
index 6640839d8..6640839d8 100644
--- a/third_party/aom/aom_ports/system_state.h
+++ b/media/libaom/src/aom_ports/system_state.h
diff --git a/third_party/aom/aom_ports/x86.h b/media/libaom/src/aom_ports/x86.h
index 52ee49cb3..52ee49cb3 100644
--- a/third_party/aom/aom_ports/x86.h
+++ b/media/libaom/src/aom_ports/x86.h
diff --git a/third_party/aom/aom_ports/x86_abi_support.asm b/media/libaom/src/aom_ports/x86_abi_support.asm
index 0e7c26287..0e7c26287 100644
--- a/third_party/aom/aom_ports/x86_abi_support.asm
+++ b/media/libaom/src/aom_ports/x86_abi_support.asm
diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/media/libaom/src/aom_scale/aom_scale.cmake
index 197dea6bd..197dea6bd 100644
--- a/third_party/aom/aom_scale/aom_scale.cmake
+++ b/media/libaom/src/aom_scale/aom_scale.cmake
diff --git a/third_party/aom/aom_scale/aom_scale.h b/media/libaom/src/aom_scale/aom_scale.h
index 11812a145..11812a145 100644
--- a/third_party/aom/aom_scale/aom_scale.h
+++ b/media/libaom/src/aom_scale/aom_scale.h
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.c b/media/libaom/src/aom_scale/aom_scale_rtcd.c
index a04e053b0..a04e053b0 100644
--- a/third_party/aom/aom_scale/aom_scale_rtcd.c
+++ b/media/libaom/src/aom_scale/aom_scale_rtcd.c
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.pl b/media/libaom/src/aom_scale/aom_scale_rtcd.pl
index c5990b1bb..c5990b1bb 100644
--- a/third_party/aom/aom_scale/aom_scale_rtcd.pl
+++ b/media/libaom/src/aom_scale/aom_scale_rtcd.pl
diff --git a/third_party/aom/aom_scale/generic/aom_scale.c b/media/libaom/src/aom_scale/generic/aom_scale.c
index 206c42c9f..206c42c9f 100644
--- a/third_party/aom/aom_scale/generic/aom_scale.c
+++ b/media/libaom/src/aom_scale/generic/aom_scale.c
diff --git a/third_party/aom/aom_scale/generic/gen_scalers.c b/media/libaom/src/aom_scale/generic/gen_scalers.c
index 549e2aa69..549e2aa69 100644
--- a/third_party/aom/aom_scale/generic/gen_scalers.c
+++ b/media/libaom/src/aom_scale/generic/gen_scalers.c
diff --git a/third_party/aom/aom_scale/generic/yv12config.c b/media/libaom/src/aom_scale/generic/yv12config.c
index 84705e2d8..84705e2d8 100644
--- a/third_party/aom/aom_scale/generic/yv12config.c
+++ b/media/libaom/src/aom_scale/generic/yv12config.c
diff --git a/third_party/aom/aom_scale/generic/yv12extend.c b/media/libaom/src/aom_scale/generic/yv12extend.c
index ba183520a..ba183520a 100644
--- a/third_party/aom/aom_scale/generic/yv12extend.c
+++ b/media/libaom/src/aom_scale/generic/yv12extend.c
diff --git a/third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c b/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
index 869e594d7..869e594d7 100644
--- a/third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c
+++ b/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
diff --git a/third_party/aom/aom_scale/yv12config.h b/media/libaom/src/aom_scale/yv12config.h
index 2fb81acd7..2fb81acd7 100644
--- a/third_party/aom/aom_scale/yv12config.h
+++ b/media/libaom/src/aom_scale/yv12config.h
diff --git a/third_party/aom/aom_util/aom_thread.c b/media/libaom/src/aom_util/aom_thread.c
index cae9f5e25..cae9f5e25 100644
--- a/third_party/aom/aom_util/aom_thread.c
+++ b/media/libaom/src/aom_util/aom_thread.c
diff --git a/third_party/aom/aom_util/aom_thread.h b/media/libaom/src/aom_util/aom_thread.h
index f14c1ac18..f14c1ac18 100644
--- a/third_party/aom/aom_util/aom_thread.h
+++ b/media/libaom/src/aom_util/aom_thread.h
diff --git a/third_party/aom/aom_util/aom_util.cmake b/media/libaom/src/aom_util/aom_util.cmake
index d4f3bce74..d4f3bce74 100644
--- a/third_party/aom/aom_util/aom_util.cmake
+++ b/media/libaom/src/aom_util/aom_util.cmake
diff --git a/third_party/aom/aom_util/debug_util.c b/media/libaom/src/aom_util/debug_util.c
index 468c47ed1..468c47ed1 100644
--- a/third_party/aom/aom_util/debug_util.c
+++ b/media/libaom/src/aom_util/debug_util.c
diff --git a/third_party/aom/aom_util/debug_util.h b/media/libaom/src/aom_util/debug_util.h
index 127a8b468..127a8b468 100644
--- a/third_party/aom/aom_util/debug_util.h
+++ b/media/libaom/src/aom_util/debug_util.h
diff --git a/third_party/aom/aom_util/endian_inl.h b/media/libaom/src/aom_util/endian_inl.h
index f536ec5b8..f536ec5b8 100644
--- a/third_party/aom/aom_util/endian_inl.h
+++ b/media/libaom/src/aom_util/endian_inl.h
diff --git a/third_party/aom/apps/aomdec.c b/media/libaom/src/apps/aomdec.c
index ff13b6f50..ff13b6f50 100644
--- a/third_party/aom/apps/aomdec.c
+++ b/media/libaom/src/apps/aomdec.c
diff --git a/third_party/aom/apps/aomenc.c b/media/libaom/src/apps/aomenc.c
index 2e5d35cfe..2e5d35cfe 100644
--- a/third_party/aom/apps/aomenc.c
+++ b/media/libaom/src/apps/aomenc.c
diff --git a/third_party/aom/apps/aomenc.h b/media/libaom/src/apps/aomenc.h
index 7c23df006..7c23df006 100644
--- a/third_party/aom/apps/aomenc.h
+++ b/media/libaom/src/apps/aomenc.h
diff --git a/third_party/aom/av1/av1.cmake b/media/libaom/src/av1/av1.cmake
index 3a7cd7ee1..3a7cd7ee1 100644
--- a/third_party/aom/av1/av1.cmake
+++ b/media/libaom/src/av1/av1.cmake
diff --git a/third_party/aom/av1/av1_cx_iface.c b/media/libaom/src/av1/av1_cx_iface.c
index 3295f618a..3295f618a 100644
--- a/third_party/aom/av1/av1_cx_iface.c
+++ b/media/libaom/src/av1/av1_cx_iface.c
diff --git a/third_party/aom/av1/av1_dx_iface.c b/media/libaom/src/av1/av1_dx_iface.c
index 4a6631047..4a6631047 100644
--- a/third_party/aom/av1/av1_dx_iface.c
+++ b/media/libaom/src/av1/av1_dx_iface.c
diff --git a/third_party/aom/av1/av1_iface_common.h b/media/libaom/src/av1/av1_iface_common.h
index 4a7af580b..4a7af580b 100644
--- a/third_party/aom/av1/av1_iface_common.h
+++ b/media/libaom/src/av1/av1_iface_common.h
diff --git a/third_party/aom/av1/common/alloccommon.c b/media/libaom/src/av1/common/alloccommon.c
index 1bf81c91d..1bf81c91d 100644
--- a/third_party/aom/av1/common/alloccommon.c
+++ b/media/libaom/src/av1/common/alloccommon.c
diff --git a/third_party/aom/av1/common/alloccommon.h b/media/libaom/src/av1/common/alloccommon.h
index 8e5896981..8e5896981 100644
--- a/third_party/aom/av1/common/alloccommon.h
+++ b/media/libaom/src/av1/common/alloccommon.h
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
index bad411743..bad411743 100644
--- a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.c
+++ b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.h b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
index 9ec658291..9ec658291 100644
--- a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.h
+++ b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
diff --git a/third_party/aom/av1/common/arm/av1_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_txfm_neon.c
index de3c54724..de3c54724 100644
--- a/third_party/aom/av1/common/arm/av1_txfm_neon.c
+++ b/media/libaom/src/av1/common/arm/av1_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_hmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
index 7134f183e..7134f183e 100644
--- a/third_party/aom/av1/common/arm/blend_a64_hmask_neon.c
+++ b/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_vmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
index 194e94c8c..194e94c8c 100644
--- a/third_party/aom/av1/common/arm/blend_a64_vmask_neon.c
+++ b/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
diff --git a/third_party/aom/av1/common/arm/cfl_neon.c b/media/libaom/src/av1/common/arm/cfl_neon.c
index 39025b5e5..39025b5e5 100644
--- a/third_party/aom/av1/common/arm/cfl_neon.c
+++ b/media/libaom/src/av1/common/arm/cfl_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.c b/media/libaom/src/av1/common/arm/convolve_neon.c
index d0c4f8ff6..d0c4f8ff6 100644
--- a/third_party/aom/av1/common/arm/convolve_neon.c
+++ b/media/libaom/src/av1/common/arm/convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.h b/media/libaom/src/av1/common/arm/convolve_neon.h
index f382984f2..f382984f2 100644
--- a/third_party/aom/av1/common/arm/convolve_neon.h
+++ b/media/libaom/src/av1/common/arm/convolve_neon.h
diff --git a/third_party/aom/av1/common/arm/jnt_convolve_neon.c b/media/libaom/src/av1/common/arm/jnt_convolve_neon.c
index e5674ef7c..e5674ef7c 100644
--- a/third_party/aom/av1/common/arm/jnt_convolve_neon.c
+++ b/media/libaom/src/av1/common/arm/jnt_convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/mem_neon.h b/media/libaom/src/av1/common/arm/mem_neon.h
index c4ae2e784..c4ae2e784 100644
--- a/third_party/aom/av1/common/arm/mem_neon.h
+++ b/media/libaom/src/av1/common/arm/mem_neon.h
diff --git a/third_party/aom/av1/common/arm/reconinter_neon.c b/media/libaom/src/av1/common/arm/reconinter_neon.c
index 44e064195..44e064195 100644
--- a/third_party/aom/av1/common/arm/reconinter_neon.c
+++ b/media/libaom/src/av1/common/arm/reconinter_neon.c
diff --git a/third_party/aom/av1/common/arm/selfguided_neon.c b/media/libaom/src/av1/common/arm/selfguided_neon.c
index b3a37c4cb..b3a37c4cb 100644
--- a/third_party/aom/av1/common/arm/selfguided_neon.c
+++ b/media/libaom/src/av1/common/arm/selfguided_neon.c
diff --git a/third_party/aom/av1/common/arm/transpose_neon.h b/media/libaom/src/av1/common/arm/transpose_neon.h
index 8a3d9f07f..8a3d9f07f 100644
--- a/third_party/aom/av1/common/arm/transpose_neon.h
+++ b/media/libaom/src/av1/common/arm/transpose_neon.h
diff --git a/third_party/aom/av1/common/arm/warp_plane_neon.c b/media/libaom/src/av1/common/arm/warp_plane_neon.c
index 7f02d42a7..7f02d42a7 100644
--- a/third_party/aom/av1/common/arm/warp_plane_neon.c
+++ b/media/libaom/src/av1/common/arm/warp_plane_neon.c
diff --git a/third_party/aom/av1/common/arm/wiener_convolve_neon.c b/media/libaom/src/av1/common/arm/wiener_convolve_neon.c
index a9bb5bcf0..a9bb5bcf0 100644
--- a/third_party/aom/av1/common/arm/wiener_convolve_neon.c
+++ b/media/libaom/src/av1/common/arm/wiener_convolve_neon.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.c b/media/libaom/src/av1/common/av1_inv_txfm1d.c
index 7ef2d6d7f..7ef2d6d7f 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d.c
+++ b/media/libaom/src/av1/common/av1_inv_txfm1d.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.h b/media/libaom/src/av1/common/av1_inv_txfm1d.h
index c31c019aa..c31c019aa 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d.h
+++ b/media/libaom/src/av1/common/av1_inv_txfm1d.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d_cfg.h b/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
index 7d80a0099..7d80a0099 100644
--- a/third_party/aom/av1/common/av1_inv_txfm1d_cfg.h
+++ b/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm2d.c b/media/libaom/src/av1/common/av1_inv_txfm2d.c
index 4e6944314..4e6944314 100644
--- a/third_party/aom/av1/common/av1_inv_txfm2d.c
+++ b/media/libaom/src/av1/common/av1_inv_txfm2d.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.c b/media/libaom/src/av1/common/av1_loopfilter.c
index 537d8dfe9..537d8dfe9 100644
--- a/third_party/aom/av1/common/av1_loopfilter.c
+++ b/media/libaom/src/av1/common/av1_loopfilter.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.h b/media/libaom/src/av1/common/av1_loopfilter.h
index 80ac61178..80ac61178 100644
--- a/third_party/aom/av1/common/av1_loopfilter.h
+++ b/media/libaom/src/av1/common/av1_loopfilter.h
diff --git a/third_party/aom/av1/common/av1_rtcd.c b/media/libaom/src/av1/common/av1_rtcd.c
index a77a4d254..a77a4d254 100644
--- a/third_party/aom/av1/common/av1_rtcd.c
+++ b/media/libaom/src/av1/common/av1_rtcd.c
diff --git a/third_party/aom/av1/common/av1_rtcd_defs.pl b/media/libaom/src/av1/common/av1_rtcd_defs.pl
index dee1f1c79..dee1f1c79 100755..100644
--- a/third_party/aom/av1/common/av1_rtcd_defs.pl
+++ b/media/libaom/src/av1/common/av1_rtcd_defs.pl
diff --git a/third_party/aom/av1/common/av1_txfm.c b/media/libaom/src/av1/common/av1_txfm.c
index bb70eab70..bb70eab70 100644
--- a/third_party/aom/av1/common/av1_txfm.c
+++ b/media/libaom/src/av1/common/av1_txfm.c
diff --git a/third_party/aom/av1/common/av1_txfm.h b/media/libaom/src/av1/common/av1_txfm.h
index 59d64ca4a..59d64ca4a 100644
--- a/third_party/aom/av1/common/av1_txfm.h
+++ b/media/libaom/src/av1/common/av1_txfm.h
diff --git a/third_party/aom/av1/common/blockd.c b/media/libaom/src/av1/common/blockd.c
index 2e796b656..2e796b656 100644
--- a/third_party/aom/av1/common/blockd.c
+++ b/media/libaom/src/av1/common/blockd.c
diff --git a/third_party/aom/av1/common/blockd.h b/media/libaom/src/av1/common/blockd.h
index a2311c1b0..a2311c1b0 100644
--- a/third_party/aom/av1/common/blockd.h
+++ b/media/libaom/src/av1/common/blockd.h
diff --git a/third_party/aom/av1/common/cdef.c b/media/libaom/src/av1/common/cdef.c
index e9e2b0e42..e9e2b0e42 100644
--- a/third_party/aom/av1/common/cdef.c
+++ b/media/libaom/src/av1/common/cdef.c
diff --git a/third_party/aom/av1/common/cdef.h b/media/libaom/src/av1/common/cdef.h
index 3b2eac8a5..3b2eac8a5 100644
--- a/third_party/aom/av1/common/cdef.h
+++ b/media/libaom/src/av1/common/cdef.h
diff --git a/third_party/aom/av1/common/cdef_block.c b/media/libaom/src/av1/common/cdef_block.c
index df1de89be..df1de89be 100644
--- a/third_party/aom/av1/common/cdef_block.c
+++ b/media/libaom/src/av1/common/cdef_block.c
diff --git a/third_party/aom/av1/common/cdef_block.h b/media/libaom/src/av1/common/cdef_block.h
index 6b4452cd6..6b4452cd6 100644
--- a/third_party/aom/av1/common/cdef_block.h
+++ b/media/libaom/src/av1/common/cdef_block.h
diff --git a/third_party/aom/av1/common/cdef_block_avx2.c b/media/libaom/src/av1/common/cdef_block_avx2.c
index e2b85b3e2..e2b85b3e2 100644
--- a/third_party/aom/av1/common/cdef_block_avx2.c
+++ b/media/libaom/src/av1/common/cdef_block_avx2.c
diff --git a/third_party/aom/av1/common/cdef_block_neon.c b/media/libaom/src/av1/common/cdef_block_neon.c
index 2d6bc65e3..2d6bc65e3 100644
--- a/third_party/aom/av1/common/cdef_block_neon.c
+++ b/media/libaom/src/av1/common/cdef_block_neon.c
diff --git a/third_party/aom/av1/common/cdef_block_simd.h b/media/libaom/src/av1/common/cdef_block_simd.h
index 14587a023..14587a023 100644
--- a/third_party/aom/av1/common/cdef_block_simd.h
+++ b/media/libaom/src/av1/common/cdef_block_simd.h
diff --git a/third_party/aom/av1/common/cdef_block_sse2.c b/media/libaom/src/av1/common/cdef_block_sse2.c
index 73f115d17..73f115d17 100644
--- a/third_party/aom/av1/common/cdef_block_sse2.c
+++ b/media/libaom/src/av1/common/cdef_block_sse2.c
diff --git a/third_party/aom/av1/common/cdef_block_sse4.c b/media/libaom/src/av1/common/cdef_block_sse4.c
index 349329af6..349329af6 100644
--- a/third_party/aom/av1/common/cdef_block_sse4.c
+++ b/media/libaom/src/av1/common/cdef_block_sse4.c
diff --git a/third_party/aom/av1/common/cdef_block_ssse3.c b/media/libaom/src/av1/common/cdef_block_ssse3.c
index 3a93b150f..3a93b150f 100644
--- a/third_party/aom/av1/common/cdef_block_ssse3.c
+++ b/media/libaom/src/av1/common/cdef_block_ssse3.c
diff --git a/third_party/aom/av1/common/cfl.c b/media/libaom/src/av1/common/cfl.c
index ccc59b4eb..ccc59b4eb 100644
--- a/third_party/aom/av1/common/cfl.c
+++ b/media/libaom/src/av1/common/cfl.c
diff --git a/third_party/aom/av1/common/cfl.h b/media/libaom/src/av1/common/cfl.h
index d627891bf..d627891bf 100644
--- a/third_party/aom/av1/common/cfl.h
+++ b/media/libaom/src/av1/common/cfl.h
diff --git a/third_party/aom/av1/common/common.h b/media/libaom/src/av1/common/common.h
index bed6083db..bed6083db 100644
--- a/third_party/aom/av1/common/common.h
+++ b/media/libaom/src/av1/common/common.h
diff --git a/third_party/aom/av1/common/common_data.h b/media/libaom/src/av1/common/common_data.h
index 46e455fdb..46e455fdb 100644
--- a/third_party/aom/av1/common/common_data.h
+++ b/media/libaom/src/av1/common/common_data.h
diff --git a/third_party/aom/av1/common/convolve.c b/media/libaom/src/av1/common/convolve.c
index 1f11126fc..1f11126fc 100644
--- a/third_party/aom/av1/common/convolve.c
+++ b/media/libaom/src/av1/common/convolve.c
diff --git a/third_party/aom/av1/common/convolve.h b/media/libaom/src/av1/common/convolve.h
index 4109dd843..4109dd843 100644
--- a/third_party/aom/av1/common/convolve.h
+++ b/media/libaom/src/av1/common/convolve.h
diff --git a/third_party/aom/av1/common/debugmodes.c b/media/libaom/src/av1/common/debugmodes.c
index 868f341b5..868f341b5 100644
--- a/third_party/aom/av1/common/debugmodes.c
+++ b/media/libaom/src/av1/common/debugmodes.c
diff --git a/third_party/aom/av1/common/entropy.c b/media/libaom/src/av1/common/entropy.c
index 4f95ef69b..4f95ef69b 100644
--- a/third_party/aom/av1/common/entropy.c
+++ b/media/libaom/src/av1/common/entropy.c
diff --git a/third_party/aom/av1/common/entropy.h b/media/libaom/src/av1/common/entropy.h
index 991692c2f..991692c2f 100644
--- a/third_party/aom/av1/common/entropy.h
+++ b/media/libaom/src/av1/common/entropy.h
diff --git a/third_party/aom/av1/common/entropymode.c b/media/libaom/src/av1/common/entropymode.c
index 41dc30ddb..41dc30ddb 100644
--- a/third_party/aom/av1/common/entropymode.c
+++ b/media/libaom/src/av1/common/entropymode.c
diff --git a/third_party/aom/av1/common/entropymode.h b/media/libaom/src/av1/common/entropymode.h
index 7047f34d2..7047f34d2 100644
--- a/third_party/aom/av1/common/entropymode.h
+++ b/media/libaom/src/av1/common/entropymode.h
diff --git a/third_party/aom/av1/common/entropymv.c b/media/libaom/src/av1/common/entropymv.c
index 491337387..491337387 100644
--- a/third_party/aom/av1/common/entropymv.c
+++ b/media/libaom/src/av1/common/entropymv.c
diff --git a/third_party/aom/av1/common/entropymv.h b/media/libaom/src/av1/common/entropymv.h
index fa818a2c1..fa818a2c1 100644
--- a/third_party/aom/av1/common/entropymv.h
+++ b/media/libaom/src/av1/common/entropymv.h
diff --git a/third_party/aom/av1/common/enums.h b/media/libaom/src/av1/common/enums.h
index 869c06ef2..869c06ef2 100644
--- a/third_party/aom/av1/common/enums.h
+++ b/media/libaom/src/av1/common/enums.h
diff --git a/third_party/aom/av1/common/filter.h b/media/libaom/src/av1/common/filter.h
index 571422d11..571422d11 100644
--- a/third_party/aom/av1/common/filter.h
+++ b/media/libaom/src/av1/common/filter.h
diff --git a/third_party/aom/av1/common/frame_buffers.c b/media/libaom/src/av1/common/frame_buffers.c
index fd6c4bc79..fd6c4bc79 100644
--- a/third_party/aom/av1/common/frame_buffers.c
+++ b/media/libaom/src/av1/common/frame_buffers.c
diff --git a/third_party/aom/av1/common/frame_buffers.h b/media/libaom/src/av1/common/frame_buffers.h
index 16188e51c..16188e51c 100644
--- a/third_party/aom/av1/common/frame_buffers.h
+++ b/media/libaom/src/av1/common/frame_buffers.h
diff --git a/third_party/aom/av1/common/idct.c b/media/libaom/src/av1/common/idct.c
index 2c1cb9827..2c1cb9827 100644
--- a/third_party/aom/av1/common/idct.c
+++ b/media/libaom/src/av1/common/idct.c
diff --git a/third_party/aom/av1/common/idct.h b/media/libaom/src/av1/common/idct.h
index d9454e73f..d9454e73f 100644
--- a/third_party/aom/av1/common/idct.h
+++ b/media/libaom/src/av1/common/idct.h
diff --git a/third_party/aom/av1/common/mv.h b/media/libaom/src/av1/common/mv.h
index 5b0225192..5b0225192 100644
--- a/third_party/aom/av1/common/mv.h
+++ b/media/libaom/src/av1/common/mv.h
diff --git a/third_party/aom/av1/common/mvref_common.c b/media/libaom/src/av1/common/mvref_common.c
index 7f24ab4e6..7f24ab4e6 100644
--- a/third_party/aom/av1/common/mvref_common.c
+++ b/media/libaom/src/av1/common/mvref_common.c
diff --git a/third_party/aom/av1/common/mvref_common.h b/media/libaom/src/av1/common/mvref_common.h
index 83f7a1ac0..83f7a1ac0 100644
--- a/third_party/aom/av1/common/mvref_common.h
+++ b/media/libaom/src/av1/common/mvref_common.h
diff --git a/third_party/aom/av1/common/obmc.h b/media/libaom/src/av1/common/obmc.h
index 1c90cd93f..1c90cd93f 100644
--- a/third_party/aom/av1/common/obmc.h
+++ b/media/libaom/src/av1/common/obmc.h
diff --git a/third_party/aom/av1/common/obu_util.c b/media/libaom/src/av1/common/obu_util.c
index 823b700b1..823b700b1 100644
--- a/third_party/aom/av1/common/obu_util.c
+++ b/media/libaom/src/av1/common/obu_util.c
diff --git a/third_party/aom/av1/common/obu_util.h b/media/libaom/src/av1/common/obu_util.h
index 7c56904c8..7c56904c8 100644
--- a/third_party/aom/av1/common/obu_util.h
+++ b/media/libaom/src/av1/common/obu_util.h
diff --git a/third_party/aom/av1/common/odintrin.c b/media/libaom/src/av1/common/odintrin.c
index 7584b2e52..7584b2e52 100644
--- a/third_party/aom/av1/common/odintrin.c
+++ b/media/libaom/src/av1/common/odintrin.c
diff --git a/third_party/aom/av1/common/odintrin.h b/media/libaom/src/av1/common/odintrin.h
index e1db0f44d..e1db0f44d 100644
--- a/third_party/aom/av1/common/odintrin.h
+++ b/media/libaom/src/av1/common/odintrin.h
diff --git a/third_party/aom/av1/common/onyxc_int.h b/media/libaom/src/av1/common/onyxc_int.h
index ff011c89e..ff011c89e 100644
--- a/third_party/aom/av1/common/onyxc_int.h
+++ b/media/libaom/src/av1/common/onyxc_int.h
diff --git a/third_party/aom/av1/common/ppc/cfl_ppc.c b/media/libaom/src/av1/common/ppc/cfl_ppc.c
index 026a07809..026a07809 100644
--- a/third_party/aom/av1/common/ppc/cfl_ppc.c
+++ b/media/libaom/src/av1/common/ppc/cfl_ppc.c
diff --git a/third_party/aom/av1/common/pred_common.c b/media/libaom/src/av1/common/pred_common.c
index 5952441d1..5952441d1 100644
--- a/third_party/aom/av1/common/pred_common.c
+++ b/media/libaom/src/av1/common/pred_common.c
diff --git a/third_party/aom/av1/common/pred_common.h b/media/libaom/src/av1/common/pred_common.h
index 6dba2322d..6dba2322d 100644
--- a/third_party/aom/av1/common/pred_common.h
+++ b/media/libaom/src/av1/common/pred_common.h
diff --git a/third_party/aom/av1/common/quant_common.c b/media/libaom/src/av1/common/quant_common.c
index 0e14da7a3..0e14da7a3 100644
--- a/third_party/aom/av1/common/quant_common.c
+++ b/media/libaom/src/av1/common/quant_common.c
diff --git a/third_party/aom/av1/common/quant_common.h b/media/libaom/src/av1/common/quant_common.h
index d1f52a660..d1f52a660 100644
--- a/third_party/aom/av1/common/quant_common.h
+++ b/media/libaom/src/av1/common/quant_common.h
diff --git a/third_party/aom/av1/common/reconinter.c b/media/libaom/src/av1/common/reconinter.c
index 3203efce4..3203efce4 100644
--- a/third_party/aom/av1/common/reconinter.c
+++ b/media/libaom/src/av1/common/reconinter.c
diff --git a/third_party/aom/av1/common/reconinter.h b/media/libaom/src/av1/common/reconinter.h
index db86c777e..db86c777e 100644
--- a/third_party/aom/av1/common/reconinter.h
+++ b/media/libaom/src/av1/common/reconinter.h
diff --git a/third_party/aom/av1/common/reconintra.c b/media/libaom/src/av1/common/reconintra.c
index 71a52e73e..71a52e73e 100644
--- a/third_party/aom/av1/common/reconintra.c
+++ b/media/libaom/src/av1/common/reconintra.c
diff --git a/third_party/aom/av1/common/reconintra.h b/media/libaom/src/av1/common/reconintra.h
index 07853aba0..07853aba0 100644
--- a/third_party/aom/av1/common/reconintra.h
+++ b/media/libaom/src/av1/common/reconintra.h
diff --git a/third_party/aom/av1/common/resize.c b/media/libaom/src/av1/common/resize.c
index d61a20aa2..d61a20aa2 100644
--- a/third_party/aom/av1/common/resize.c
+++ b/media/libaom/src/av1/common/resize.c
diff --git a/third_party/aom/av1/common/resize.h b/media/libaom/src/av1/common/resize.h
index 9a59a8d63..9a59a8d63 100644
--- a/third_party/aom/av1/common/resize.h
+++ b/media/libaom/src/av1/common/resize.h
diff --git a/third_party/aom/av1/common/restoration.c b/media/libaom/src/av1/common/restoration.c
index d276a915b..d276a915b 100644
--- a/third_party/aom/av1/common/restoration.c
+++ b/media/libaom/src/av1/common/restoration.c
diff --git a/third_party/aom/av1/common/restoration.h b/media/libaom/src/av1/common/restoration.h
index d834f9270..d834f9270 100644
--- a/third_party/aom/av1/common/restoration.h
+++ b/media/libaom/src/av1/common/restoration.h
diff --git a/third_party/aom/av1/common/scale.c b/media/libaom/src/av1/common/scale.c
index c525fe229..c525fe229 100644
--- a/third_party/aom/av1/common/scale.c
+++ b/media/libaom/src/av1/common/scale.c
diff --git a/third_party/aom/av1/common/scale.h b/media/libaom/src/av1/common/scale.h
index 748e958c3..748e958c3 100644
--- a/third_party/aom/av1/common/scale.h
+++ b/media/libaom/src/av1/common/scale.h
diff --git a/third_party/aom/av1/common/scan.c b/media/libaom/src/av1/common/scan.c
index 31a787b53..31a787b53 100644
--- a/third_party/aom/av1/common/scan.c
+++ b/media/libaom/src/av1/common/scan.c
diff --git a/third_party/aom/av1/common/scan.h b/media/libaom/src/av1/common/scan.h
index 233dc0efa..233dc0efa 100644
--- a/third_party/aom/av1/common/scan.h
+++ b/media/libaom/src/av1/common/scan.h
diff --git a/third_party/aom/av1/common/seg_common.c b/media/libaom/src/av1/common/seg_common.c
index cd189ad76..cd189ad76 100644
--- a/third_party/aom/av1/common/seg_common.c
+++ b/media/libaom/src/av1/common/seg_common.c
diff --git a/third_party/aom/av1/common/seg_common.h b/media/libaom/src/av1/common/seg_common.h
index 8c35bba86..8c35bba86 100644
--- a/third_party/aom/av1/common/seg_common.h
+++ b/media/libaom/src/av1/common/seg_common.h
diff --git a/third_party/aom/av1/common/thread_common.c b/media/libaom/src/av1/common/thread_common.c
index 8df4c9a09..8df4c9a09 100644
--- a/third_party/aom/av1/common/thread_common.c
+++ b/media/libaom/src/av1/common/thread_common.c
diff --git a/third_party/aom/av1/common/thread_common.h b/media/libaom/src/av1/common/thread_common.h
index 23d61d72a..23d61d72a 100644
--- a/third_party/aom/av1/common/thread_common.h
+++ b/media/libaom/src/av1/common/thread_common.h
diff --git a/third_party/aom/av1/common/tile_common.c b/media/libaom/src/av1/common/tile_common.c
index 1b413487f..1b413487f 100644
--- a/third_party/aom/av1/common/tile_common.c
+++ b/media/libaom/src/av1/common/tile_common.c
diff --git a/third_party/aom/av1/common/tile_common.h b/media/libaom/src/av1/common/tile_common.h
index c03553dc6..c03553dc6 100644
--- a/third_party/aom/av1/common/tile_common.h
+++ b/media/libaom/src/av1/common/tile_common.h
diff --git a/third_party/aom/av1/common/timing.c b/media/libaom/src/av1/common/timing.c
index 49dbde78f..49dbde78f 100644
--- a/third_party/aom/av1/common/timing.c
+++ b/media/libaom/src/av1/common/timing.c
diff --git a/third_party/aom/av1/common/timing.h b/media/libaom/src/av1/common/timing.h
index 06939ae43..06939ae43 100644
--- a/third_party/aom/av1/common/timing.h
+++ b/media/libaom/src/av1/common/timing.h
diff --git a/third_party/aom/av1/common/token_cdfs.h b/media/libaom/src/av1/common/token_cdfs.h
index 53e956450..53e956450 100644
--- a/third_party/aom/av1/common/token_cdfs.h
+++ b/media/libaom/src/av1/common/token_cdfs.h
diff --git a/third_party/aom/av1/common/txb_common.c b/media/libaom/src/av1/common/txb_common.c
index c96d37cca..c96d37cca 100644
--- a/third_party/aom/av1/common/txb_common.c
+++ b/media/libaom/src/av1/common/txb_common.c
diff --git a/third_party/aom/av1/common/txb_common.h b/media/libaom/src/av1/common/txb_common.h
index 1dda51f8b..1dda51f8b 100644
--- a/third_party/aom/av1/common/txb_common.h
+++ b/media/libaom/src/av1/common/txb_common.h
diff --git a/third_party/aom/av1/common/warped_motion.c b/media/libaom/src/av1/common/warped_motion.c
index 4144c4389..4144c4389 100644
--- a/third_party/aom/av1/common/warped_motion.c
+++ b/media/libaom/src/av1/common/warped_motion.c
diff --git a/third_party/aom/av1/common/warped_motion.h b/media/libaom/src/av1/common/warped_motion.h
index a1a4f067d..a1a4f067d 100644
--- a/third_party/aom/av1/common/warped_motion.h
+++ b/media/libaom/src/av1/common/warped_motion.h
diff --git a/third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
index 8aa14696f..8aa14696f 100644
--- a/third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c
+++ b/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
index d9fb53785..d9fb53785 100644
--- a/third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c
+++ b/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c b/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c
index 212d3bd72..212d3bd72 100644
--- a/third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c
+++ b/media/libaom/src/av1/common/x86/av1_highbd_convolve_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
index 5db2ccf6c..5db2ccf6c 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c
+++ b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
index f74cbaeaa..f74cbaeaa 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h
+++ b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
index 995bc3da4..995bc3da4 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c
+++ b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
index 66bd339d1..66bd339d1 100644
--- a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h
+++ b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse2.h b/media/libaom/src/av1/common/x86/av1_txfm_sse2.h
index 77aeb6eb1..77aeb6eb1 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse2.h
+++ b/media/libaom/src/av1/common/x86/av1_txfm_sse2.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.c b/media/libaom/src/av1/common/x86/av1_txfm_sse4.c
index 90b9879cc..90b9879cc 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse4.c
+++ b/media/libaom/src/av1/common/x86/av1_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.h b/media/libaom/src/av1/common/x86/av1_txfm_sse4.h
index 6cad821b1..6cad821b1 100644
--- a/third_party/aom/av1/common/x86/av1_txfm_sse4.h
+++ b/media/libaom/src/av1/common/x86/av1_txfm_sse4.h
diff --git a/third_party/aom/av1/common/x86/cfl_avx2.c b/media/libaom/src/av1/common/x86/cfl_avx2.c
index a8bfdcce6..a8bfdcce6 100644
--- a/third_party/aom/av1/common/x86/cfl_avx2.c
+++ b/media/libaom/src/av1/common/x86/cfl_avx2.c
diff --git a/third_party/aom/av1/common/x86/cfl_simd.h b/media/libaom/src/av1/common/x86/cfl_simd.h
index 3b342cd4e..3b342cd4e 100644
--- a/third_party/aom/av1/common/x86/cfl_simd.h
+++ b/media/libaom/src/av1/common/x86/cfl_simd.h
diff --git a/third_party/aom/av1/common/x86/cfl_sse2.c b/media/libaom/src/av1/common/x86/cfl_sse2.c
index 4783fe098..4783fe098 100644
--- a/third_party/aom/av1/common/x86/cfl_sse2.c
+++ b/media/libaom/src/av1/common/x86/cfl_sse2.c
diff --git a/third_party/aom/av1/common/x86/cfl_ssse3.c b/media/libaom/src/av1/common/x86/cfl_ssse3.c
index bbf007295..bbf007295 100644
--- a/third_party/aom/av1/common/x86/cfl_ssse3.c
+++ b/media/libaom/src/av1/common/x86/cfl_ssse3.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/convolve_2d_avx2.c
index 0acafd044..0acafd044 100644
--- a/third_party/aom/av1/common/x86/convolve_2d_avx2.c
+++ b/media/libaom/src/av1/common/x86/convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/convolve_2d_sse2.c
index b1a62a4f6..b1a62a4f6 100644
--- a/third_party/aom/av1/common/x86/convolve_2d_sse2.c
+++ b/media/libaom/src/av1/common/x86/convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/convolve_avx2.c b/media/libaom/src/av1/common/x86/convolve_avx2.c
index 0e91ea947..0e91ea947 100644
--- a/third_party/aom/av1/common/x86/convolve_avx2.c
+++ b/media/libaom/src/av1/common/x86/convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_sse2.c b/media/libaom/src/av1/common/x86/convolve_sse2.c
index 5016642de..5016642de 100644
--- a/third_party/aom/av1/common/x86/convolve_sse2.c
+++ b/media/libaom/src/av1/common/x86/convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/filterintra_sse4.c b/media/libaom/src/av1/common/x86/filterintra_sse4.c
index c11edc1d4..c11edc1d4 100644
--- a/third_party/aom/av1/common/x86/filterintra_sse4.c
+++ b/media/libaom/src/av1/common/x86/filterintra_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
index ae68f0bbb..ae68f0bbb 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c
+++ b/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
index 15f8872c1..15f8872c1 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
+++ b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
index 3f8dafb4b..3f8dafb4b 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c
+++ b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
index 1d029db39..1d029db39 100644
--- a/third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c
+++ b/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
index ade2af03e..ade2af03e 100644
--- a/third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
index e29e0baf5..e29e0baf5 100644
--- a/third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c
+++ b/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
index e298cf653..e298cf653 100644
--- a/third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c
+++ b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
index 1a29985b5..1a29985b5 100644
--- a/third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c
+++ b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h b/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
index 6f24e5948..6f24e5948 100644
--- a/third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h
+++ b/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
diff --git a/third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c b/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
index 4bcab0564..4bcab0564 100644
--- a/third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c
+++ b/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
index 0c8a8505b..0c8a8505b 100644
--- a/third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c
+++ b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
index 818b1099c..818b1099c 100644
--- a/third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c
+++ b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/intra_edge_sse4.c b/media/libaom/src/av1/common/x86/intra_edge_sse4.c
index 0c857b583..0c857b583 100644
--- a/third_party/aom/av1/common/x86/intra_edge_sse4.c
+++ b/media/libaom/src/av1/common/x86/intra_edge_sse4.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
index 9f2e2b457..9f2e2b457 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_avx2.c
+++ b/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_sse2.c b/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
index 87dc3242e..87dc3242e 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_sse2.c
+++ b/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_ssse3.c b/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
index 822772782..822772782 100644
--- a/third_party/aom/av1/common/x86/jnt_convolve_ssse3.c
+++ b/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/reconinter_avx2.c b/media/libaom/src/av1/common/x86/reconinter_avx2.c
index f645e0454..f645e0454 100644
--- a/third_party/aom/av1/common/x86/reconinter_avx2.c
+++ b/media/libaom/src/av1/common/x86/reconinter_avx2.c
diff --git a/third_party/aom/av1/common/x86/reconinter_sse4.c b/media/libaom/src/av1/common/x86/reconinter_sse4.c
index 5171ca493..5171ca493 100644
--- a/third_party/aom/av1/common/x86/reconinter_sse4.c
+++ b/media/libaom/src/av1/common/x86/reconinter_sse4.c
diff --git a/third_party/aom/av1/common/x86/reconinter_ssse3.c b/media/libaom/src/av1/common/x86/reconinter_ssse3.c
index cf684447c..cf684447c 100644
--- a/third_party/aom/av1/common/x86/reconinter_ssse3.c
+++ b/media/libaom/src/av1/common/x86/reconinter_ssse3.c
diff --git a/third_party/aom/av1/common/x86/selfguided_avx2.c b/media/libaom/src/av1/common/x86/selfguided_avx2.c
index 0aaf1f454..0aaf1f454 100644
--- a/third_party/aom/av1/common/x86/selfguided_avx2.c
+++ b/media/libaom/src/av1/common/x86/selfguided_avx2.c
diff --git a/third_party/aom/av1/common/x86/selfguided_sse4.c b/media/libaom/src/av1/common/x86/selfguided_sse4.c
index ea3f6d942..ea3f6d942 100644
--- a/third_party/aom/av1/common/x86/selfguided_sse4.c
+++ b/media/libaom/src/av1/common/x86/selfguided_sse4.c
diff --git a/third_party/aom/av1/common/x86/warp_plane_sse4.c b/media/libaom/src/av1/common/x86/warp_plane_sse4.c
index b810cea2e..b810cea2e 100644
--- a/third_party/aom/av1/common/x86/warp_plane_sse4.c
+++ b/media/libaom/src/av1/common/x86/warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
index 87a6e1239..87a6e1239 100644
--- a/third_party/aom/av1/common/x86/wiener_convolve_avx2.c
+++ b/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_sse2.c b/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
index f9d00b733..f9d00b733 100644
--- a/third_party/aom/av1/common/x86/wiener_convolve_sse2.c
+++ b/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
diff --git a/third_party/aom/av1/decoder/accounting.c b/media/libaom/src/av1/decoder/accounting.c
index 8d8f3dfdb..8d8f3dfdb 100644
--- a/third_party/aom/av1/decoder/accounting.c
+++ b/media/libaom/src/av1/decoder/accounting.c
diff --git a/third_party/aom/av1/decoder/accounting.h b/media/libaom/src/av1/decoder/accounting.h
index 288e5e63e..288e5e63e 100644
--- a/third_party/aom/av1/decoder/accounting.h
+++ b/media/libaom/src/av1/decoder/accounting.h
diff --git a/third_party/aom/av1/decoder/decodeframe.c b/media/libaom/src/av1/decoder/decodeframe.c
index 31f14b531..31f14b531 100644
--- a/third_party/aom/av1/decoder/decodeframe.c
+++ b/media/libaom/src/av1/decoder/decodeframe.c
diff --git a/third_party/aom/av1/decoder/decodeframe.h b/media/libaom/src/av1/decoder/decodeframe.h
index ddad273f1..ddad273f1 100644
--- a/third_party/aom/av1/decoder/decodeframe.h
+++ b/media/libaom/src/av1/decoder/decodeframe.h
diff --git a/third_party/aom/av1/decoder/decodemv.c b/media/libaom/src/av1/decoder/decodemv.c
index 551e4d543..551e4d543 100644
--- a/third_party/aom/av1/decoder/decodemv.c
+++ b/media/libaom/src/av1/decoder/decodemv.c
diff --git a/third_party/aom/av1/decoder/decodemv.h b/media/libaom/src/av1/decoder/decodemv.h
index 1625e5bd2..1625e5bd2 100644
--- a/third_party/aom/av1/decoder/decodemv.h
+++ b/media/libaom/src/av1/decoder/decodemv.h
diff --git a/third_party/aom/av1/decoder/decoder.c b/media/libaom/src/av1/decoder/decoder.c
index a5f4fd67f..a5f4fd67f 100644
--- a/third_party/aom/av1/decoder/decoder.c
+++ b/media/libaom/src/av1/decoder/decoder.c
diff --git a/third_party/aom/av1/decoder/decoder.h b/media/libaom/src/av1/decoder/decoder.h
index 5ca939c24..5ca939c24 100644
--- a/third_party/aom/av1/decoder/decoder.h
+++ b/media/libaom/src/av1/decoder/decoder.h
diff --git a/third_party/aom/av1/decoder/decodetxb.c b/media/libaom/src/av1/decoder/decodetxb.c
index f3ef2d55e..f3ef2d55e 100644
--- a/third_party/aom/av1/decoder/decodetxb.c
+++ b/media/libaom/src/av1/decoder/decodetxb.c
diff --git a/third_party/aom/av1/decoder/decodetxb.h b/media/libaom/src/av1/decoder/decodetxb.h
index fe04f6abd..fe04f6abd 100644
--- a/third_party/aom/av1/decoder/decodetxb.h
+++ b/media/libaom/src/av1/decoder/decodetxb.h
diff --git a/third_party/aom/av1/decoder/detokenize.c b/media/libaom/src/av1/decoder/detokenize.c
index 9d54bd13d..9d54bd13d 100644
--- a/third_party/aom/av1/decoder/detokenize.c
+++ b/media/libaom/src/av1/decoder/detokenize.c
diff --git a/third_party/aom/av1/decoder/detokenize.h b/media/libaom/src/av1/decoder/detokenize.h
index 173b437a9..173b437a9 100644
--- a/third_party/aom/av1/decoder/detokenize.h
+++ b/media/libaom/src/av1/decoder/detokenize.h
diff --git a/third_party/aom/av1/decoder/dthread.c b/media/libaom/src/av1/decoder/dthread.c
index 3946c787a..3946c787a 100644
--- a/third_party/aom/av1/decoder/dthread.c
+++ b/media/libaom/src/av1/decoder/dthread.c
diff --git a/third_party/aom/av1/decoder/dthread.h b/media/libaom/src/av1/decoder/dthread.h
index 1d264b07e..1d264b07e 100644
--- a/third_party/aom/av1/decoder/dthread.h
+++ b/media/libaom/src/av1/decoder/dthread.h
diff --git a/third_party/aom/av1/decoder/inspection.c b/media/libaom/src/av1/decoder/inspection.c
index e6c89298a..e6c89298a 100644
--- a/third_party/aom/av1/decoder/inspection.c
+++ b/media/libaom/src/av1/decoder/inspection.c
diff --git a/third_party/aom/av1/decoder/inspection.h b/media/libaom/src/av1/decoder/inspection.h
index 7214a9bed..7214a9bed 100644
--- a/third_party/aom/av1/decoder/inspection.h
+++ b/media/libaom/src/av1/decoder/inspection.h
diff --git a/third_party/aom/av1/decoder/obu.c b/media/libaom/src/av1/decoder/obu.c
index 44ecf818e..44ecf818e 100644
--- a/third_party/aom/av1/decoder/obu.c
+++ b/media/libaom/src/av1/decoder/obu.c
diff --git a/third_party/aom/av1/decoder/obu.h b/media/libaom/src/av1/decoder/obu.h
index 5ab243fc9..5ab243fc9 100644
--- a/third_party/aom/av1/decoder/obu.h
+++ b/media/libaom/src/av1/decoder/obu.h
diff --git a/third_party/aom/av1/encoder/aq_complexity.c b/media/libaom/src/av1/encoder/aq_complexity.c
index 80f8e2e66..80f8e2e66 100644
--- a/third_party/aom/av1/encoder/aq_complexity.c
+++ b/media/libaom/src/av1/encoder/aq_complexity.c
diff --git a/third_party/aom/av1/encoder/aq_complexity.h b/media/libaom/src/av1/encoder/aq_complexity.h
index 3421d74c9..3421d74c9 100644
--- a/third_party/aom/av1/encoder/aq_complexity.h
+++ b/media/libaom/src/av1/encoder/aq_complexity.h
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.c b/media/libaom/src/av1/encoder/aq_cyclicrefresh.c
index f532d48da..f532d48da 100644
--- a/third_party/aom/av1/encoder/aq_cyclicrefresh.c
+++ b/media/libaom/src/av1/encoder/aq_cyclicrefresh.c
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.h b/media/libaom/src/av1/encoder/aq_cyclicrefresh.h
index b45781983..b45781983 100644
--- a/third_party/aom/av1/encoder/aq_cyclicrefresh.h
+++ b/media/libaom/src/av1/encoder/aq_cyclicrefresh.h
diff --git a/third_party/aom/av1/encoder/aq_variance.c b/media/libaom/src/av1/encoder/aq_variance.c
index 58f906bdc..58f906bdc 100644
--- a/third_party/aom/av1/encoder/aq_variance.c
+++ b/media/libaom/src/av1/encoder/aq_variance.c
diff --git a/third_party/aom/av1/encoder/aq_variance.h b/media/libaom/src/av1/encoder/aq_variance.h
index 2d22b663e..2d22b663e 100644
--- a/third_party/aom/av1/encoder/aq_variance.h
+++ b/media/libaom/src/av1/encoder/aq_variance.h
diff --git a/third_party/aom/av1/encoder/arm/neon/quantize_neon.c b/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
index 36e7d3370..36e7d3370 100644
--- a/third_party/aom/av1/encoder/arm/neon/quantize_neon.c
+++ b/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
index 98505e0b1..98505e0b1 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d.c
+++ b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
index 9dcf16552..9dcf16552 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d.h
+++ b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
index 98b6530db..98b6530db 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h
+++ b/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm2d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
index f25a667cf..f25a667cf 100644
--- a/third_party/aom/av1/encoder/av1_fwd_txfm2d.c
+++ b/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
diff --git a/third_party/aom/av1/encoder/av1_quantize.c b/media/libaom/src/av1/encoder/av1_quantize.c
index a0a926005..a0a926005 100644
--- a/third_party/aom/av1/encoder/av1_quantize.c
+++ b/media/libaom/src/av1/encoder/av1_quantize.c
diff --git a/third_party/aom/av1/encoder/av1_quantize.h b/media/libaom/src/av1/encoder/av1_quantize.h
index 35af9a67a..35af9a67a 100644
--- a/third_party/aom/av1/encoder/av1_quantize.h
+++ b/media/libaom/src/av1/encoder/av1_quantize.h
diff --git a/third_party/aom/av1/encoder/bitstream.c b/media/libaom/src/av1/encoder/bitstream.c
index 2c4acdb02..2c4acdb02 100644
--- a/third_party/aom/av1/encoder/bitstream.c
+++ b/media/libaom/src/av1/encoder/bitstream.c
diff --git a/third_party/aom/av1/encoder/bitstream.h b/media/libaom/src/av1/encoder/bitstream.h
index 465ccaed5..465ccaed5 100644
--- a/third_party/aom/av1/encoder/bitstream.h
+++ b/media/libaom/src/av1/encoder/bitstream.h
diff --git a/third_party/aom/av1/encoder/block.h b/media/libaom/src/av1/encoder/block.h
index 0bc5dea82..0bc5dea82 100644
--- a/third_party/aom/av1/encoder/block.h
+++ b/media/libaom/src/av1/encoder/block.h
diff --git a/third_party/aom/av1/encoder/blockiness.c b/media/libaom/src/av1/encoder/blockiness.c
index f7cff9e53..f7cff9e53 100644
--- a/third_party/aom/av1/encoder/blockiness.c
+++ b/media/libaom/src/av1/encoder/blockiness.c
diff --git a/third_party/aom/av1/encoder/context_tree.c b/media/libaom/src/av1/encoder/context_tree.c
index 57f59f304..57f59f304 100644
--- a/third_party/aom/av1/encoder/context_tree.c
+++ b/media/libaom/src/av1/encoder/context_tree.c
diff --git a/third_party/aom/av1/encoder/context_tree.h b/media/libaom/src/av1/encoder/context_tree.h
index 4efc34985..4efc34985 100644
--- a/third_party/aom/av1/encoder/context_tree.h
+++ b/media/libaom/src/av1/encoder/context_tree.h
diff --git a/third_party/aom/av1/encoder/corner_detect.c b/media/libaom/src/av1/encoder/corner_detect.c
index e4c59dd9c..e4c59dd9c 100644
--- a/third_party/aom/av1/encoder/corner_detect.c
+++ b/media/libaom/src/av1/encoder/corner_detect.c
diff --git a/third_party/aom/av1/encoder/corner_detect.h b/media/libaom/src/av1/encoder/corner_detect.h
index cab59a774..cab59a774 100644
--- a/third_party/aom/av1/encoder/corner_detect.h
+++ b/media/libaom/src/av1/encoder/corner_detect.h
diff --git a/third_party/aom/av1/encoder/corner_match.c b/media/libaom/src/av1/encoder/corner_match.c
index 29e934deb..29e934deb 100644
--- a/third_party/aom/av1/encoder/corner_match.c
+++ b/media/libaom/src/av1/encoder/corner_match.c
diff --git a/third_party/aom/av1/encoder/corner_match.h b/media/libaom/src/av1/encoder/corner_match.h
index 535d2faed..535d2faed 100644
--- a/third_party/aom/av1/encoder/corner_match.h
+++ b/media/libaom/src/av1/encoder/corner_match.h
diff --git a/third_party/aom/av1/encoder/cost.c b/media/libaom/src/av1/encoder/cost.c
index 323e2aed5..323e2aed5 100644
--- a/third_party/aom/av1/encoder/cost.c
+++ b/media/libaom/src/av1/encoder/cost.c
diff --git a/third_party/aom/av1/encoder/cost.h b/media/libaom/src/av1/encoder/cost.h
index af5b09837..af5b09837 100644
--- a/third_party/aom/av1/encoder/cost.h
+++ b/media/libaom/src/av1/encoder/cost.h
diff --git a/third_party/aom/av1/encoder/dwt.c b/media/libaom/src/av1/encoder/dwt.c
index 04088b25f..04088b25f 100644
--- a/third_party/aom/av1/encoder/dwt.c
+++ b/media/libaom/src/av1/encoder/dwt.c
diff --git a/third_party/aom/av1/encoder/dwt.h b/media/libaom/src/av1/encoder/dwt.h
index 37306c6a5..37306c6a5 100644
--- a/third_party/aom/av1/encoder/dwt.h
+++ b/media/libaom/src/av1/encoder/dwt.h
diff --git a/third_party/aom/av1/encoder/encodeframe.c b/media/libaom/src/av1/encoder/encodeframe.c
index cb226c59e..cb226c59e 100644
--- a/third_party/aom/av1/encoder/encodeframe.c
+++ b/media/libaom/src/av1/encoder/encodeframe.c
diff --git a/third_party/aom/av1/encoder/encodeframe.h b/media/libaom/src/av1/encoder/encodeframe.h
index e8cf9b468..e8cf9b468 100644
--- a/third_party/aom/av1/encoder/encodeframe.h
+++ b/media/libaom/src/av1/encoder/encodeframe.h
diff --git a/third_party/aom/av1/encoder/encodemb.c b/media/libaom/src/av1/encoder/encodemb.c
index ad12577e6..ad12577e6 100644
--- a/third_party/aom/av1/encoder/encodemb.c
+++ b/media/libaom/src/av1/encoder/encodemb.c
diff --git a/third_party/aom/av1/encoder/encodemb.h b/media/libaom/src/av1/encoder/encodemb.h
index 39080de59..39080de59 100644
--- a/third_party/aom/av1/encoder/encodemb.h
+++ b/media/libaom/src/av1/encoder/encodemb.h
diff --git a/third_party/aom/av1/encoder/encodemv.c b/media/libaom/src/av1/encoder/encodemv.c
index 42eb5abf6..42eb5abf6 100644
--- a/third_party/aom/av1/encoder/encodemv.c
+++ b/media/libaom/src/av1/encoder/encodemv.c
diff --git a/third_party/aom/av1/encoder/encodemv.h b/media/libaom/src/av1/encoder/encodemv.h
index 37ff547c8..37ff547c8 100644
--- a/third_party/aom/av1/encoder/encodemv.h
+++ b/media/libaom/src/av1/encoder/encodemv.h
diff --git a/third_party/aom/av1/encoder/encoder.c b/media/libaom/src/av1/encoder/encoder.c
index a2da2df89..a2da2df89 100644
--- a/third_party/aom/av1/encoder/encoder.c
+++ b/media/libaom/src/av1/encoder/encoder.c
diff --git a/third_party/aom/av1/encoder/encoder.h b/media/libaom/src/av1/encoder/encoder.h
index ee7fc4637..ee7fc4637 100644
--- a/third_party/aom/av1/encoder/encoder.h
+++ b/media/libaom/src/av1/encoder/encoder.h
diff --git a/third_party/aom/av1/encoder/encodetxb.c b/media/libaom/src/av1/encoder/encodetxb.c
index 5a31d93d7..5a31d93d7 100644
--- a/third_party/aom/av1/encoder/encodetxb.c
+++ b/media/libaom/src/av1/encoder/encodetxb.c
diff --git a/third_party/aom/av1/encoder/encodetxb.h b/media/libaom/src/av1/encoder/encodetxb.h
index 40ae343b0..40ae343b0 100644
--- a/third_party/aom/av1/encoder/encodetxb.h
+++ b/media/libaom/src/av1/encoder/encodetxb.h
diff --git a/third_party/aom/av1/encoder/ethread.c b/media/libaom/src/av1/encoder/ethread.c
index e8ac30bb5..e8ac30bb5 100644
--- a/third_party/aom/av1/encoder/ethread.c
+++ b/media/libaom/src/av1/encoder/ethread.c
diff --git a/third_party/aom/av1/encoder/ethread.h b/media/libaom/src/av1/encoder/ethread.h
index 5de4b4803..5de4b4803 100644
--- a/third_party/aom/av1/encoder/ethread.h
+++ b/media/libaom/src/av1/encoder/ethread.h
diff --git a/third_party/aom/av1/encoder/extend.c b/media/libaom/src/av1/encoder/extend.c
index e9621a574..e9621a574 100644
--- a/third_party/aom/av1/encoder/extend.c
+++ b/media/libaom/src/av1/encoder/extend.c
diff --git a/third_party/aom/av1/encoder/extend.h b/media/libaom/src/av1/encoder/extend.h
index e0432cc97..e0432cc97 100644
--- a/third_party/aom/av1/encoder/extend.h
+++ b/media/libaom/src/av1/encoder/extend.h
diff --git a/third_party/aom/av1/encoder/firstpass.c b/media/libaom/src/av1/encoder/firstpass.c
index 69dd20c52..69dd20c52 100644
--- a/third_party/aom/av1/encoder/firstpass.c
+++ b/media/libaom/src/av1/encoder/firstpass.c
diff --git a/third_party/aom/av1/encoder/firstpass.h b/media/libaom/src/av1/encoder/firstpass.h
index 4b7325ae2..4b7325ae2 100644
--- a/third_party/aom/av1/encoder/firstpass.h
+++ b/media/libaom/src/av1/encoder/firstpass.h
diff --git a/third_party/aom/av1/encoder/global_motion.c b/media/libaom/src/av1/encoder/global_motion.c
index e9f8b0bb4..e9f8b0bb4 100644
--- a/third_party/aom/av1/encoder/global_motion.c
+++ b/media/libaom/src/av1/encoder/global_motion.c
diff --git a/third_party/aom/av1/encoder/global_motion.h b/media/libaom/src/av1/encoder/global_motion.h
index c7c016c43..c7c016c43 100644
--- a/third_party/aom/av1/encoder/global_motion.h
+++ b/media/libaom/src/av1/encoder/global_motion.h
diff --git a/third_party/aom/av1/encoder/grain_test_vectors.h b/media/libaom/src/av1/encoder/grain_test_vectors.h
index 945dc3733..945dc3733 100644
--- a/third_party/aom/av1/encoder/grain_test_vectors.h
+++ b/media/libaom/src/av1/encoder/grain_test_vectors.h
diff --git a/third_party/aom/av1/encoder/hash.c b/media/libaom/src/av1/encoder/hash.c
index 180115d9f..180115d9f 100644
--- a/third_party/aom/av1/encoder/hash.c
+++ b/media/libaom/src/av1/encoder/hash.c
diff --git a/third_party/aom/av1/encoder/hash.h b/media/libaom/src/av1/encoder/hash.h
index 826c004d6..826c004d6 100644
--- a/third_party/aom/av1/encoder/hash.h
+++ b/media/libaom/src/av1/encoder/hash.h
diff --git a/third_party/aom/av1/encoder/hash_motion.c b/media/libaom/src/av1/encoder/hash_motion.c
index e85a516e8..e85a516e8 100644
--- a/third_party/aom/av1/encoder/hash_motion.c
+++ b/media/libaom/src/av1/encoder/hash_motion.c
diff --git a/third_party/aom/av1/encoder/hash_motion.h b/media/libaom/src/av1/encoder/hash_motion.h
index df3ec3215..df3ec3215 100644
--- a/third_party/aom/av1/encoder/hash_motion.h
+++ b/media/libaom/src/av1/encoder/hash_motion.h
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.c b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
index 67898fd18..67898fd18 100644
--- a/third_party/aom/av1/encoder/hybrid_fwd_txfm.c
+++ b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.h b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
index daabc7119..daabc7119 100644
--- a/third_party/aom/av1/encoder/hybrid_fwd_txfm.h
+++ b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
diff --git a/third_party/aom/av1/encoder/k_means_template.h b/media/libaom/src/av1/encoder/k_means_template.h
index 9e526b88b..9e526b88b 100644
--- a/third_party/aom/av1/encoder/k_means_template.h
+++ b/media/libaom/src/av1/encoder/k_means_template.h
diff --git a/third_party/aom/av1/encoder/lookahead.c b/media/libaom/src/av1/encoder/lookahead.c
index 1bf8ecbac..1bf8ecbac 100644
--- a/third_party/aom/av1/encoder/lookahead.c
+++ b/media/libaom/src/av1/encoder/lookahead.c
diff --git a/third_party/aom/av1/encoder/lookahead.h b/media/libaom/src/av1/encoder/lookahead.h
index e55224cf7..e55224cf7 100644
--- a/third_party/aom/av1/encoder/lookahead.h
+++ b/media/libaom/src/av1/encoder/lookahead.h
diff --git a/third_party/aom/av1/encoder/mathutils.h b/media/libaom/src/av1/encoder/mathutils.h
index 64f936176..64f936176 100644
--- a/third_party/aom/av1/encoder/mathutils.h
+++ b/media/libaom/src/av1/encoder/mathutils.h
diff --git a/third_party/aom/av1/encoder/mbgraph.c b/media/libaom/src/av1/encoder/mbgraph.c
index 1a35ff77c..1a35ff77c 100644
--- a/third_party/aom/av1/encoder/mbgraph.c
+++ b/media/libaom/src/av1/encoder/mbgraph.c
diff --git a/third_party/aom/av1/encoder/mbgraph.h b/media/libaom/src/av1/encoder/mbgraph.h
index ba08476f7..ba08476f7 100644
--- a/third_party/aom/av1/encoder/mbgraph.h
+++ b/media/libaom/src/av1/encoder/mbgraph.h
diff --git a/third_party/aom/av1/encoder/mcomp.c b/media/libaom/src/av1/encoder/mcomp.c
index 8f6de9b53..8f6de9b53 100644
--- a/third_party/aom/av1/encoder/mcomp.c
+++ b/media/libaom/src/av1/encoder/mcomp.c
diff --git a/third_party/aom/av1/encoder/mcomp.h b/media/libaom/src/av1/encoder/mcomp.h
index a975218b0..a975218b0 100644
--- a/third_party/aom/av1/encoder/mcomp.h
+++ b/media/libaom/src/av1/encoder/mcomp.h
diff --git a/third_party/aom/av1/encoder/mips/msa/error_msa.c b/media/libaom/src/av1/encoder/mips/msa/error_msa.c
index 2e86dee43..2e86dee43 100644
--- a/third_party/aom/av1/encoder/mips/msa/error_msa.c
+++ b/media/libaom/src/av1/encoder/mips/msa/error_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c b/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
index 085c08bfb..085c08bfb 100644
--- a/third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c
+++ b/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c b/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
index 531ae090a..531ae090a 100644
--- a/third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c
+++ b/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
diff --git a/third_party/aom/av1/encoder/ml.c b/media/libaom/src/av1/encoder/ml.c
index d21def43a..d21def43a 100644
--- a/third_party/aom/av1/encoder/ml.c
+++ b/media/libaom/src/av1/encoder/ml.c
diff --git a/third_party/aom/av1/encoder/ml.h b/media/libaom/src/av1/encoder/ml.h
index cb8ef2871..cb8ef2871 100644
--- a/third_party/aom/av1/encoder/ml.h
+++ b/media/libaom/src/av1/encoder/ml.h
diff --git a/third_party/aom/av1/encoder/palette.c b/media/libaom/src/av1/encoder/palette.c
index e61cd02ce..e61cd02ce 100644
--- a/third_party/aom/av1/encoder/palette.c
+++ b/media/libaom/src/av1/encoder/palette.c
diff --git a/third_party/aom/av1/encoder/palette.h b/media/libaom/src/av1/encoder/palette.h
index 8b88c4755..8b88c4755 100644
--- a/third_party/aom/av1/encoder/palette.h
+++ b/media/libaom/src/av1/encoder/palette.h
diff --git a/third_party/aom/av1/encoder/partition_model_weights.h b/media/libaom/src/av1/encoder/partition_model_weights.h
index 437ea43f9..437ea43f9 100644
--- a/third_party/aom/av1/encoder/partition_model_weights.h
+++ b/media/libaom/src/av1/encoder/partition_model_weights.h
diff --git a/third_party/aom/av1/encoder/pickcdef.c b/media/libaom/src/av1/encoder/pickcdef.c
index 6d154a7d2..6d154a7d2 100644
--- a/third_party/aom/av1/encoder/pickcdef.c
+++ b/media/libaom/src/av1/encoder/pickcdef.c
diff --git a/third_party/aom/av1/encoder/picklpf.c b/media/libaom/src/av1/encoder/picklpf.c
index c5508e25c..c5508e25c 100644
--- a/third_party/aom/av1/encoder/picklpf.c
+++ b/media/libaom/src/av1/encoder/picklpf.c
diff --git a/third_party/aom/av1/encoder/picklpf.h b/media/libaom/src/av1/encoder/picklpf.h
index 357097ae1..357097ae1 100644
--- a/third_party/aom/av1/encoder/picklpf.h
+++ b/media/libaom/src/av1/encoder/picklpf.h
diff --git a/third_party/aom/av1/encoder/pickrst.c b/media/libaom/src/av1/encoder/pickrst.c
index e7804f6b4..e7804f6b4 100644
--- a/third_party/aom/av1/encoder/pickrst.c
+++ b/media/libaom/src/av1/encoder/pickrst.c
diff --git a/third_party/aom/av1/encoder/pickrst.h b/media/libaom/src/av1/encoder/pickrst.h
index 3fec0c34b..3fec0c34b 100644
--- a/third_party/aom/av1/encoder/pickrst.h
+++ b/media/libaom/src/av1/encoder/pickrst.h
diff --git a/third_party/aom/av1/encoder/pustats.h b/media/libaom/src/av1/encoder/pustats.h
index 40dd46768..40dd46768 100644
--- a/third_party/aom/av1/encoder/pustats.h
+++ b/media/libaom/src/av1/encoder/pustats.h
diff --git a/third_party/aom/av1/encoder/random.h b/media/libaom/src/av1/encoder/random.h
index 0bca39102..0bca39102 100644
--- a/third_party/aom/av1/encoder/random.h
+++ b/media/libaom/src/av1/encoder/random.h
diff --git a/third_party/aom/av1/encoder/ransac.c b/media/libaom/src/av1/encoder/ransac.c
index 781f528eb..781f528eb 100644
--- a/third_party/aom/av1/encoder/ransac.c
+++ b/media/libaom/src/av1/encoder/ransac.c
diff --git a/third_party/aom/av1/encoder/ransac.h b/media/libaom/src/av1/encoder/ransac.h
index c429f2ce5..c429f2ce5 100644
--- a/third_party/aom/av1/encoder/ransac.h
+++ b/media/libaom/src/av1/encoder/ransac.h
diff --git a/third_party/aom/av1/encoder/rate_distortion_model_params.h b/media/libaom/src/av1/encoder/rate_distortion_model_params.h
index 7cd0962c5..7cd0962c5 100644
--- a/third_party/aom/av1/encoder/rate_distortion_model_params.h
+++ b/media/libaom/src/av1/encoder/rate_distortion_model_params.h
diff --git a/third_party/aom/av1/encoder/ratectrl.c b/media/libaom/src/av1/encoder/ratectrl.c
index 2597fb990..2597fb990 100644
--- a/third_party/aom/av1/encoder/ratectrl.c
+++ b/media/libaom/src/av1/encoder/ratectrl.c
diff --git a/third_party/aom/av1/encoder/ratectrl.h b/media/libaom/src/av1/encoder/ratectrl.h
index 198ecab97..198ecab97 100644
--- a/third_party/aom/av1/encoder/ratectrl.h
+++ b/media/libaom/src/av1/encoder/ratectrl.h
diff --git a/third_party/aom/av1/encoder/rd.c b/media/libaom/src/av1/encoder/rd.c
index b87d89e50..b87d89e50 100644
--- a/third_party/aom/av1/encoder/rd.c
+++ b/media/libaom/src/av1/encoder/rd.c
diff --git a/third_party/aom/av1/encoder/rd.h b/media/libaom/src/av1/encoder/rd.h
index 755b61df5..755b61df5 100644
--- a/third_party/aom/av1/encoder/rd.h
+++ b/media/libaom/src/av1/encoder/rd.h
diff --git a/third_party/aom/av1/encoder/rdopt.c b/media/libaom/src/av1/encoder/rdopt.c
index c2d15534f..c2d15534f 100644
--- a/third_party/aom/av1/encoder/rdopt.c
+++ b/media/libaom/src/av1/encoder/rdopt.c
diff --git a/third_party/aom/av1/encoder/rdopt.h b/media/libaom/src/av1/encoder/rdopt.h
index 4c11f90b8..4c11f90b8 100644
--- a/third_party/aom/av1/encoder/rdopt.h
+++ b/media/libaom/src/av1/encoder/rdopt.h
diff --git a/third_party/aom/av1/encoder/reconinter_enc.c b/media/libaom/src/av1/encoder/reconinter_enc.c
index 23d920fc3..23d920fc3 100644
--- a/third_party/aom/av1/encoder/reconinter_enc.c
+++ b/media/libaom/src/av1/encoder/reconinter_enc.c
diff --git a/third_party/aom/av1/encoder/reconinter_enc.h b/media/libaom/src/av1/encoder/reconinter_enc.h
index 10d5e8c28..10d5e8c28 100644
--- a/third_party/aom/av1/encoder/reconinter_enc.h
+++ b/media/libaom/src/av1/encoder/reconinter_enc.h
diff --git a/third_party/aom/av1/encoder/segmentation.c b/media/libaom/src/av1/encoder/segmentation.c
index 2e9102745..2e9102745 100644
--- a/third_party/aom/av1/encoder/segmentation.c
+++ b/media/libaom/src/av1/encoder/segmentation.c
diff --git a/third_party/aom/av1/encoder/segmentation.h b/media/libaom/src/av1/encoder/segmentation.h
index 1ad13d66a..1ad13d66a 100644
--- a/third_party/aom/av1/encoder/segmentation.h
+++ b/media/libaom/src/av1/encoder/segmentation.h
diff --git a/third_party/aom/av1/encoder/speed_features.c b/media/libaom/src/av1/encoder/speed_features.c
index 4c35baae0..4c35baae0 100644
--- a/third_party/aom/av1/encoder/speed_features.c
+++ b/media/libaom/src/av1/encoder/speed_features.c
diff --git a/third_party/aom/av1/encoder/speed_features.h b/media/libaom/src/av1/encoder/speed_features.h
index 41013b2e7..41013b2e7 100644
--- a/third_party/aom/av1/encoder/speed_features.h
+++ b/media/libaom/src/av1/encoder/speed_features.h
diff --git a/third_party/aom/av1/encoder/temporal_filter.c b/media/libaom/src/av1/encoder/temporal_filter.c
index 75fdf02a5..75fdf02a5 100644
--- a/third_party/aom/av1/encoder/temporal_filter.c
+++ b/media/libaom/src/av1/encoder/temporal_filter.c
diff --git a/third_party/aom/av1/encoder/temporal_filter.h b/media/libaom/src/av1/encoder/temporal_filter.h
index 2ddc68b2c..2ddc68b2c 100644
--- a/third_party/aom/av1/encoder/temporal_filter.h
+++ b/media/libaom/src/av1/encoder/temporal_filter.h
diff --git a/third_party/aom/av1/encoder/tokenize.c b/media/libaom/src/av1/encoder/tokenize.c
index 16a6a9a35..16a6a9a35 100644
--- a/third_party/aom/av1/encoder/tokenize.c
+++ b/media/libaom/src/av1/encoder/tokenize.c
diff --git a/third_party/aom/av1/encoder/tokenize.h b/media/libaom/src/av1/encoder/tokenize.h
index 63b505f36..63b505f36 100644
--- a/third_party/aom/av1/encoder/tokenize.h
+++ b/media/libaom/src/av1/encoder/tokenize.h
diff --git a/third_party/aom/av1/encoder/tx_prune_model_weights.h b/media/libaom/src/av1/encoder/tx_prune_model_weights.h
index 405bc9e6e..405bc9e6e 100644
--- a/third_party/aom/av1/encoder/tx_prune_model_weights.h
+++ b/media/libaom/src/av1/encoder/tx_prune_model_weights.h
diff --git a/third_party/aom/av1/encoder/wedge_utils.c b/media/libaom/src/av1/encoder/wedge_utils.c
index e6edbb6af..e6edbb6af 100644
--- a/third_party/aom/av1/encoder/wedge_utils.c
+++ b/media/libaom/src/av1/encoder/wedge_utils.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
index 07615543c..07615543c 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
index 592462e20..592462e20 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
index 8ec0256eb..8ec0256eb 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
index 38707137c..38707137c 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
index 6aae7ce1e..6aae7ce1e 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
index 99a6b9082..99a6b9082 100644
--- a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h
+++ b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
index b58911fcb..b58911fcb 100644
--- a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
index 40b3b460b..40b3b460b 100644
--- a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
index df22aaba7..df22aaba7 100644
--- a/third_party/aom/av1/encoder/x86/av1_quantize_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_sse2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
index b07e7717f..b07e7717f 100644
--- a/third_party/aom/av1/encoder/x86/av1_quantize_sse2.c
+++ b/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
index ad4ae274e..ad4ae274e 100644
--- a/third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
+++ b/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
index faa2a232a..faa2a232a 100644
--- a/third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm
+++ b/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h b/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
index 6df2a8bdb..6df2a8bdb 100644
--- a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h
+++ b/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
diff --git a/third_party/aom/av1/encoder/x86/corner_match_sse4.c b/media/libaom/src/av1/encoder/x86/corner_match_sse4.c
index 93f37b71d..93f37b71d 100644
--- a/third_party/aom/av1/encoder/x86/corner_match_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/corner_match_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/dct_sse2.asm b/media/libaom/src/av1/encoder/x86/dct_sse2.asm
index b18554818..b18554818 100644
--- a/third_party/aom/av1/encoder/x86/dct_sse2.asm
+++ b/media/libaom/src/av1/encoder/x86/dct_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_avx2.c b/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
index 7642f57d1..7642f57d1 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse2.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
index dedb4d02f..dedb4d02f 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_sse2.c
+++ b/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse4.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
index 5e0687cd3..5e0687cd3 100644
--- a/third_party/aom/av1/encoder/x86/encodetxb_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/error_intrin_avx2.c b/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
index 7d4f69585..7d4f69585 100644
--- a/third_party/aom/av1/encoder/x86/error_intrin_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/error_sse2.asm b/media/libaom/src/av1/encoder/x86/error_sse2.asm
index 72e9e22b1..72e9e22b1 100644
--- a/third_party/aom/av1/encoder/x86/error_sse2.asm
+++ b/media/libaom/src/av1/encoder/x86/error_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/hash_sse42.c b/media/libaom/src/av1/encoder/x86/hash_sse42.c
index 65fa46311..65fa46311 100644
--- a/third_party/aom/av1/encoder/x86/hash_sse42.c
+++ b/media/libaom/src/av1/encoder/x86/hash_sse42.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
index 777304ace..777304ace 100644
--- a/third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c
+++ b/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c b/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
index 535485ae8..535485ae8 100644
--- a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_avx2.c b/media/libaom/src/av1/encoder/x86/pickrst_avx2.c
index 06aaaa7ee..06aaaa7ee 100644
--- a/third_party/aom/av1/encoder/x86/pickrst_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/pickrst_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_sse4.c b/media/libaom/src/av1/encoder/x86/pickrst_sse4.c
index 04e4d1afc..04e4d1afc 100644
--- a/third_party/aom/av1/encoder/x86/pickrst_sse4.c
+++ b/media/libaom/src/av1/encoder/x86/pickrst_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm b/media/libaom/src/av1/encoder/x86/temporal_filter_apply_sse2.asm
index 30983d1c1..30983d1c1 100644
--- a/third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm
+++ b/media/libaom/src/av1/encoder/x86/temporal_filter_apply_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_avx2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
index 2a792f14e..2a792f14e 100644
--- a/third_party/aom/av1/encoder/x86/wedge_utils_avx2.c
+++ b/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_sse2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
index 4d2e99f25..4d2e99f25 100644
--- a/third_party/aom/av1/encoder/x86/wedge_utils_sse2.c
+++ b/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
diff --git a/third_party/aom/av1/exports_com b/media/libaom/src/av1/exports_com
index 5c8e0e09d..5c8e0e09d 100644
--- a/third_party/aom/av1/exports_com
+++ b/media/libaom/src/av1/exports_com
diff --git a/third_party/aom/av1/exports_dec b/media/libaom/src/av1/exports_dec
index daabf6766..daabf6766 100644
--- a/third_party/aom/av1/exports_dec
+++ b/media/libaom/src/av1/exports_dec
diff --git a/third_party/aom/av1/exports_enc b/media/libaom/src/av1/exports_enc
index dc4a9eae7..dc4a9eae7 100644
--- a/third_party/aom/av1/exports_enc
+++ b/media/libaom/src/av1/exports_enc
diff --git a/third_party/aom/av1/exports_test b/media/libaom/src/av1/exports_test
index dab377575..dab377575 100644
--- a/third_party/aom/av1/exports_test
+++ b/media/libaom/src/av1/exports_test
diff --git a/third_party/aom/build/cmake/aom_config.c.template b/media/libaom/src/build/cmake/aom_config.c.template
index 62f0a10ab..62f0a10ab 100644
--- a/third_party/aom/build/cmake/aom_config.c.template
+++ b/media/libaom/src/build/cmake/aom_config.c.template
diff --git a/third_party/aom/build/cmake/aom_config_defaults.cmake b/media/libaom/src/build/cmake/aom_config_defaults.cmake
index a07438cfe..a07438cfe 100644
--- a/third_party/aom/build/cmake/aom_config_defaults.cmake
+++ b/media/libaom/src/build/cmake/aom_config_defaults.cmake
diff --git a/third_party/aom/build/cmake/aom_configure.cmake b/media/libaom/src/build/cmake/aom_configure.cmake
index c0c7381e8..c0c7381e8 100644
--- a/third_party/aom/build/cmake/aom_configure.cmake
+++ b/media/libaom/src/build/cmake/aom_configure.cmake
diff --git a/third_party/aom/build/cmake/aom_experiment_deps.cmake b/media/libaom/src/build/cmake/aom_experiment_deps.cmake
index 0688704e5..0688704e5 100644
--- a/third_party/aom/build/cmake/aom_experiment_deps.cmake
+++ b/media/libaom/src/build/cmake/aom_experiment_deps.cmake
diff --git a/third_party/aom/build/cmake/aom_optimization.cmake b/media/libaom/src/build/cmake/aom_optimization.cmake
index be32a3212..be32a3212 100644
--- a/third_party/aom/build/cmake/aom_optimization.cmake
+++ b/media/libaom/src/build/cmake/aom_optimization.cmake
diff --git a/third_party/aom/build/cmake/compiler_flags.cmake b/media/libaom/src/build/cmake/compiler_flags.cmake
index 79192c1fa..79192c1fa 100644
--- a/third_party/aom/build/cmake/compiler_flags.cmake
+++ b/media/libaom/src/build/cmake/compiler_flags.cmake
diff --git a/third_party/aom/build/cmake/compiler_tests.cmake b/media/libaom/src/build/cmake/compiler_tests.cmake
index f115610ba..f115610ba 100644
--- a/third_party/aom/build/cmake/compiler_tests.cmake
+++ b/media/libaom/src/build/cmake/compiler_tests.cmake
diff --git a/third_party/aom/build/cmake/cpu.cmake b/media/libaom/src/build/cmake/cpu.cmake
index 6e8089e63..6e8089e63 100644
--- a/third_party/aom/build/cmake/cpu.cmake
+++ b/media/libaom/src/build/cmake/cpu.cmake
diff --git a/third_party/aom/build/cmake/dist.cmake b/media/libaom/src/build/cmake/dist.cmake
index 6f81736f0..6f81736f0 100644
--- a/third_party/aom/build/cmake/dist.cmake
+++ b/media/libaom/src/build/cmake/dist.cmake
diff --git a/third_party/aom/build/cmake/exports.cmake b/media/libaom/src/build/cmake/exports.cmake
index e0813dc0f..e0813dc0f 100644
--- a/third_party/aom/build/cmake/exports.cmake
+++ b/media/libaom/src/build/cmake/exports.cmake
diff --git a/third_party/aom/build/cmake/exports_sources.cmake b/media/libaom/src/build/cmake/exports_sources.cmake
index 576920e36..576920e36 100644
--- a/third_party/aom/build/cmake/exports_sources.cmake
+++ b/media/libaom/src/build/cmake/exports_sources.cmake
diff --git a/third_party/aom/build/cmake/generate_aom_config_templates.cmake b/media/libaom/src/build/cmake/generate_aom_config_templates.cmake
index b91c036de..b91c036de 100644
--- a/third_party/aom/build/cmake/generate_aom_config_templates.cmake
+++ b/media/libaom/src/build/cmake/generate_aom_config_templates.cmake
diff --git a/third_party/aom/build/cmake/generate_exports.cmake b/media/libaom/src/build/cmake/generate_exports.cmake
index 7ab5aaef8..7ab5aaef8 100644
--- a/third_party/aom/build/cmake/generate_exports.cmake
+++ b/media/libaom/src/build/cmake/generate_exports.cmake
diff --git a/third_party/aom/build/cmake/ios-Info.plist b/media/libaom/src/build/cmake/ios-Info.plist
index 300e3e310..300e3e310 100644
--- a/third_party/aom/build/cmake/ios-Info.plist
+++ b/media/libaom/src/build/cmake/ios-Info.plist
diff --git a/third_party/aom/build/cmake/iosbuild.sh b/media/libaom/src/build/cmake/iosbuild.sh
index 167ece200..167ece200 100755..100644
--- a/third_party/aom/build/cmake/iosbuild.sh
+++ b/media/libaom/src/build/cmake/iosbuild.sh
diff --git a/third_party/aom/build/cmake/msvc_runtime.cmake b/media/libaom/src/build/cmake/msvc_runtime.cmake
index 9e4cbea43..9e4cbea43 100644
--- a/third_party/aom/build/cmake/msvc_runtime.cmake
+++ b/media/libaom/src/build/cmake/msvc_runtime.cmake
diff --git a/third_party/aom/build/cmake/pkg_config.cmake b/media/libaom/src/build/cmake/pkg_config.cmake
index 64e20214e..64e20214e 100644
--- a/third_party/aom/build/cmake/pkg_config.cmake
+++ b/media/libaom/src/build/cmake/pkg_config.cmake
diff --git a/third_party/aom/build/cmake/rtcd.pl b/media/libaom/src/build/cmake/rtcd.pl
index 46e06907c..46e06907c 100755..100644
--- a/third_party/aom/build/cmake/rtcd.pl
+++ b/media/libaom/src/build/cmake/rtcd.pl
diff --git a/third_party/aom/build/cmake/sanitizers.cmake b/media/libaom/src/build/cmake/sanitizers.cmake
index 77708e101..77708e101 100644
--- a/third_party/aom/build/cmake/sanitizers.cmake
+++ b/media/libaom/src/build/cmake/sanitizers.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake b/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
index 8f4095145..8f4095145 100644
--- a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake
+++ b/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-ios.cmake b/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
index 6feb1090f..6feb1090f 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-ios.cmake
+++ b/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
index 590a97a8e..590a97a8e 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
index b5b2ff1cd..b5b2ff1cd 100644
--- a/third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
index 32a1b534a..32a1b534a 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake
+++ b/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
index 7d3d63085..7d3d63085 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
index cf06a11b3..cf06a11b3 100644
--- a/third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
index 0940a6ee8..0940a6ee8 100644
--- a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake
+++ b/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake b/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
index 76e0bd140..76e0bd140 100644
--- a/third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake
+++ b/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
index 0f93490b1..0f93490b1 100644
--- a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
index ad9aab09d..ad9aab09d 100644
--- a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
index c86cc27e3..c86cc27e3 100644
--- a/third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
index 6b6f52cac..6b6f52cac 100644
--- a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-linux.cmake b/media/libaom/src/build/cmake/toolchains/x86-linux.cmake
index c2a700bfe..c2a700bfe 100644
--- a/third_party/aom/build/cmake/toolchains/x86-linux.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86-linux.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-macos.cmake b/media/libaom/src/build/cmake/toolchains/x86-macos.cmake
index 7a46e06a9..7a46e06a9 100644
--- a/third_party/aom/build/cmake/toolchains/x86-macos.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86-macos.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
index c986c4ee3..c986c4ee3 100644
--- a/third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
index d4b40ed09..d4b40ed09 100644
--- a/third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
index 00d94d5f1..00d94d5f1 100644
--- a/third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake
+++ b/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/util.cmake b/media/libaom/src/build/cmake/util.cmake
index b70ec4013..b70ec4013 100644
--- a/third_party/aom/build/cmake/util.cmake
+++ b/media/libaom/src/build/cmake/util.cmake
diff --git a/third_party/aom/build/cmake/version.cmake b/media/libaom/src/build/cmake/version.cmake
index d169b12ac..d169b12ac 100644
--- a/third_party/aom/build/cmake/version.cmake
+++ b/media/libaom/src/build/cmake/version.cmake
diff --git a/third_party/aom/build/cmake/version.pl b/media/libaom/src/build/cmake/version.pl
index 7d23f2b27..7d23f2b27 100755..100644
--- a/third_party/aom/build/cmake/version.pl
+++ b/media/libaom/src/build/cmake/version.pl
diff --git a/third_party/aom/codereview.settings b/media/libaom/src/codereview.settings
index 185e9344c..185e9344c 100644
--- a/third_party/aom/codereview.settings
+++ b/media/libaom/src/codereview.settings
diff --git a/third_party/aom/common/args.c b/media/libaom/src/common/args.c
index 7131e24de..7131e24de 100644
--- a/third_party/aom/common/args.c
+++ b/media/libaom/src/common/args.c
diff --git a/third_party/aom/common/args.h b/media/libaom/src/common/args.h
index 6a2664269..6a2664269 100644
--- a/third_party/aom/common/args.h
+++ b/media/libaom/src/common/args.h
diff --git a/third_party/aom/common/av1_config.c b/media/libaom/src/common/av1_config.c
index e8decf76f..e8decf76f 100644
--- a/third_party/aom/common/av1_config.c
+++ b/media/libaom/src/common/av1_config.c
diff --git a/third_party/aom/common/av1_config.h b/media/libaom/src/common/av1_config.h
index a15bedb30..a15bedb30 100644
--- a/third_party/aom/common/av1_config.h
+++ b/media/libaom/src/common/av1_config.h
diff --git a/third_party/aom/common/ivfdec.c b/media/libaom/src/common/ivfdec.c
index 80d73b04c..80d73b04c 100644
--- a/third_party/aom/common/ivfdec.c
+++ b/media/libaom/src/common/ivfdec.c
diff --git a/third_party/aom/common/ivfdec.h b/media/libaom/src/common/ivfdec.h
index ea294faa1..ea294faa1 100644
--- a/third_party/aom/common/ivfdec.h
+++ b/media/libaom/src/common/ivfdec.h
diff --git a/third_party/aom/common/ivfenc.c b/media/libaom/src/common/ivfenc.c
index 64715f4d7..64715f4d7 100644
--- a/third_party/aom/common/ivfenc.c
+++ b/media/libaom/src/common/ivfenc.c
diff --git a/third_party/aom/common/ivfenc.h b/media/libaom/src/common/ivfenc.h
index 8f6d947d4..8f6d947d4 100644
--- a/third_party/aom/common/ivfenc.h
+++ b/media/libaom/src/common/ivfenc.h
diff --git a/third_party/aom/common/md5_utils.c b/media/libaom/src/common/md5_utils.c
index b69e1cc72..b69e1cc72 100644
--- a/third_party/aom/common/md5_utils.c
+++ b/media/libaom/src/common/md5_utils.c
diff --git a/third_party/aom/common/md5_utils.h b/media/libaom/src/common/md5_utils.h
index 144fa3ad2..144fa3ad2 100644
--- a/third_party/aom/common/md5_utils.h
+++ b/media/libaom/src/common/md5_utils.h
diff --git a/third_party/aom/common/obudec.c b/media/libaom/src/common/obudec.c
index acbd12e0c..acbd12e0c 100644
--- a/third_party/aom/common/obudec.c
+++ b/media/libaom/src/common/obudec.c
diff --git a/third_party/aom/common/obudec.h b/media/libaom/src/common/obudec.h
index b2adb1e3d..b2adb1e3d 100644
--- a/third_party/aom/common/obudec.h
+++ b/media/libaom/src/common/obudec.h
diff --git a/third_party/aom/common/rawenc.c b/media/libaom/src/common/rawenc.c
index 5a2731d3a..5a2731d3a 100644
--- a/third_party/aom/common/rawenc.c
+++ b/media/libaom/src/common/rawenc.c
diff --git a/third_party/aom/common/rawenc.h b/media/libaom/src/common/rawenc.h
index cf5e00e6f..cf5e00e6f 100644
--- a/third_party/aom/common/rawenc.h
+++ b/media/libaom/src/common/rawenc.h
diff --git a/third_party/aom/common/tools_common.c b/media/libaom/src/common/tools_common.c
index 21cd80026..21cd80026 100644
--- a/third_party/aom/common/tools_common.c
+++ b/media/libaom/src/common/tools_common.c
diff --git a/third_party/aom/common/tools_common.h b/media/libaom/src/common/tools_common.h
index 4e1d12f4a..4e1d12f4a 100644
--- a/third_party/aom/common/tools_common.h
+++ b/media/libaom/src/common/tools_common.h
diff --git a/third_party/aom/common/video_common.h b/media/libaom/src/common/video_common.h
index bf95031be..bf95031be 100644
--- a/third_party/aom/common/video_common.h
+++ b/media/libaom/src/common/video_common.h
diff --git a/third_party/aom/common/video_reader.c b/media/libaom/src/common/video_reader.c
index 47ad6e189..47ad6e189 100644
--- a/third_party/aom/common/video_reader.c
+++ b/media/libaom/src/common/video_reader.c
diff --git a/third_party/aom/common/video_reader.h b/media/libaom/src/common/video_reader.h
index 903deae84..903deae84 100644
--- a/third_party/aom/common/video_reader.h
+++ b/media/libaom/src/common/video_reader.h
diff --git a/third_party/aom/common/video_writer.c b/media/libaom/src/common/video_writer.c
index a7ec309fc..a7ec309fc 100644
--- a/third_party/aom/common/video_writer.c
+++ b/media/libaom/src/common/video_writer.c
diff --git a/third_party/aom/common/video_writer.h b/media/libaom/src/common/video_writer.h
index 3e2b6554b..3e2b6554b 100644
--- a/third_party/aom/common/video_writer.h
+++ b/media/libaom/src/common/video_writer.h
diff --git a/third_party/aom/common/warnings.c b/media/libaom/src/common/warnings.c
index 2facee252..2facee252 100644
--- a/third_party/aom/common/warnings.c
+++ b/media/libaom/src/common/warnings.c
diff --git a/third_party/aom/common/warnings.h b/media/libaom/src/common/warnings.h
index 36f1fe070..36f1fe070 100644
--- a/third_party/aom/common/warnings.h
+++ b/media/libaom/src/common/warnings.h
diff --git a/third_party/aom/common/webmdec.cc b/media/libaom/src/common/webmdec.cc
index 17ac53c93..17ac53c93 100644
--- a/third_party/aom/common/webmdec.cc
+++ b/media/libaom/src/common/webmdec.cc
diff --git a/third_party/aom/common/webmdec.h b/media/libaom/src/common/webmdec.h
index 5ac75cb30..5ac75cb30 100644
--- a/third_party/aom/common/webmdec.h
+++ b/media/libaom/src/common/webmdec.h
diff --git a/third_party/aom/common/webmenc.cc b/media/libaom/src/common/webmenc.cc
index 58ab33670..58ab33670 100644
--- a/third_party/aom/common/webmenc.cc
+++ b/media/libaom/src/common/webmenc.cc
diff --git a/third_party/aom/common/webmenc.h b/media/libaom/src/common/webmenc.h
index aa9832fba..aa9832fba 100644
--- a/third_party/aom/common/webmenc.h
+++ b/media/libaom/src/common/webmenc.h
diff --git a/third_party/aom/common/y4menc.c b/media/libaom/src/common/y4menc.c
index 585d22197..585d22197 100644
--- a/third_party/aom/common/y4menc.c
+++ b/media/libaom/src/common/y4menc.c
diff --git a/third_party/aom/common/y4menc.h b/media/libaom/src/common/y4menc.h
index f6d5fd86b..f6d5fd86b 100644
--- a/third_party/aom/common/y4menc.h
+++ b/media/libaom/src/common/y4menc.h
diff --git a/third_party/aom/common/y4minput.c b/media/libaom/src/common/y4minput.c
index eca8b1bba..eca8b1bba 100644
--- a/third_party/aom/common/y4minput.c
+++ b/media/libaom/src/common/y4minput.c
diff --git a/third_party/aom/common/y4minput.h b/media/libaom/src/common/y4minput.h
index 01b9ce972..01b9ce972 100644
--- a/third_party/aom/common/y4minput.h
+++ b/media/libaom/src/common/y4minput.h
diff --git a/third_party/aom/docs.cmake b/media/libaom/src/docs.cmake
index b5bfa9b56..b5bfa9b56 100644
--- a/third_party/aom/docs.cmake
+++ b/media/libaom/src/docs.cmake
diff --git a/third_party/aom/examples/analyzer.cc b/media/libaom/src/examples/analyzer.cc
index 6a42eca24..6a42eca24 100644
--- a/third_party/aom/examples/analyzer.cc
+++ b/media/libaom/src/examples/analyzer.cc
diff --git a/third_party/aom/examples/aom_cx_set_ref.c b/media/libaom/src/examples/aom_cx_set_ref.c
index 8e3d216fe..8e3d216fe 100644
--- a/third_party/aom/examples/aom_cx_set_ref.c
+++ b/media/libaom/src/examples/aom_cx_set_ref.c
diff --git a/third_party/aom/examples/decode_to_md5.c b/media/libaom/src/examples/decode_to_md5.c
index bc127b78d..bc127b78d 100644
--- a/third_party/aom/examples/decode_to_md5.c
+++ b/media/libaom/src/examples/decode_to_md5.c
diff --git a/third_party/aom/examples/decode_with_drops.c b/media/libaom/src/examples/decode_with_drops.c
index 214401958..214401958 100644
--- a/third_party/aom/examples/decode_with_drops.c
+++ b/media/libaom/src/examples/decode_with_drops.c
diff --git a/third_party/aom/examples/encoder_util.c b/media/libaom/src/examples/encoder_util.c
index e43b37250..e43b37250 100644
--- a/third_party/aom/examples/encoder_util.c
+++ b/media/libaom/src/examples/encoder_util.c
diff --git a/third_party/aom/examples/encoder_util.h b/media/libaom/src/examples/encoder_util.h
index a6bb3fb48..a6bb3fb48 100644
--- a/third_party/aom/examples/encoder_util.h
+++ b/media/libaom/src/examples/encoder_util.h
diff --git a/third_party/aom/examples/inspect.c b/media/libaom/src/examples/inspect.c
index 9d5f0dcfc..9d5f0dcfc 100644
--- a/third_party/aom/examples/inspect.c
+++ b/media/libaom/src/examples/inspect.c
diff --git a/third_party/aom/examples/lightfield_bitstream_parsing.c b/media/libaom/src/examples/lightfield_bitstream_parsing.c
index 159f1617a..159f1617a 100644
--- a/third_party/aom/examples/lightfield_bitstream_parsing.c
+++ b/media/libaom/src/examples/lightfield_bitstream_parsing.c
diff --git a/third_party/aom/examples/lightfield_decoder.c b/media/libaom/src/examples/lightfield_decoder.c
index f5e54db7f..f5e54db7f 100644
--- a/third_party/aom/examples/lightfield_decoder.c
+++ b/media/libaom/src/examples/lightfield_decoder.c
diff --git a/third_party/aom/examples/lightfield_encoder.c b/media/libaom/src/examples/lightfield_encoder.c
index e55cd5ce3..e55cd5ce3 100644
--- a/third_party/aom/examples/lightfield_encoder.c
+++ b/media/libaom/src/examples/lightfield_encoder.c
diff --git a/third_party/aom/examples/lightfield_tile_list_decoder.c b/media/libaom/src/examples/lightfield_tile_list_decoder.c
index 5556bf0e7..5556bf0e7 100644
--- a/third_party/aom/examples/lightfield_tile_list_decoder.c
+++ b/media/libaom/src/examples/lightfield_tile_list_decoder.c
diff --git a/third_party/aom/examples/lossless_encoder.c b/media/libaom/src/examples/lossless_encoder.c
index 438ff21c6..438ff21c6 100644
--- a/third_party/aom/examples/lossless_encoder.c
+++ b/media/libaom/src/examples/lossless_encoder.c
diff --git a/third_party/aom/examples/noise_model.c b/media/libaom/src/examples/noise_model.c
index 5cc6003b6..5cc6003b6 100644
--- a/third_party/aom/examples/noise_model.c
+++ b/media/libaom/src/examples/noise_model.c
diff --git a/third_party/aom/examples/resize_util.c b/media/libaom/src/examples/resize_util.c
index 6a84d5740..6a84d5740 100644
--- a/third_party/aom/examples/resize_util.c
+++ b/media/libaom/src/examples/resize_util.c
diff --git a/third_party/aom/examples/scalable_decoder.c b/media/libaom/src/examples/scalable_decoder.c
index c22924223..c22924223 100644
--- a/third_party/aom/examples/scalable_decoder.c
+++ b/media/libaom/src/examples/scalable_decoder.c
diff --git a/third_party/aom/examples/scalable_encoder.c b/media/libaom/src/examples/scalable_encoder.c
index 7af03e29f..7af03e29f 100644
--- a/third_party/aom/examples/scalable_encoder.c
+++ b/media/libaom/src/examples/scalable_encoder.c
diff --git a/third_party/aom/examples/set_maps.c b/media/libaom/src/examples/set_maps.c
index 9aeb96e43..9aeb96e43 100644
--- a/third_party/aom/examples/set_maps.c
+++ b/media/libaom/src/examples/set_maps.c
diff --git a/third_party/aom/examples/simple_decoder.c b/media/libaom/src/examples/simple_decoder.c
index d098d1e0b..d098d1e0b 100644
--- a/third_party/aom/examples/simple_decoder.c
+++ b/media/libaom/src/examples/simple_decoder.c
diff --git a/third_party/aom/examples/simple_encoder.c b/media/libaom/src/examples/simple_encoder.c
index 01a37cf0c..01a37cf0c 100644
--- a/third_party/aom/examples/simple_encoder.c
+++ b/media/libaom/src/examples/simple_encoder.c
diff --git a/third_party/aom/examples/twopass_encoder.c b/media/libaom/src/examples/twopass_encoder.c
index a03bc6cc2..a03bc6cc2 100644
--- a/third_party/aom/examples/twopass_encoder.c
+++ b/media/libaom/src/examples/twopass_encoder.c
diff --git a/third_party/aom/keywords.dox b/media/libaom/src/keywords.dox
index 56f536890..56f536890 100644
--- a/third_party/aom/keywords.dox
+++ b/media/libaom/src/keywords.dox
diff --git a/third_party/aom/libs.doxy_template b/media/libaom/src/libs.doxy_template
index c522e21d3..c522e21d3 100644
--- a/third_party/aom/libs.doxy_template
+++ b/media/libaom/src/libs.doxy_template
diff --git a/third_party/aom/mainpage.dox b/media/libaom/src/mainpage.dox
index 03a299ae1..03a299ae1 100644
--- a/third_party/aom/mainpage.dox
+++ b/media/libaom/src/mainpage.dox
diff --git a/third_party/aom/stats/aomstats.c b/media/libaom/src/stats/aomstats.c
index 4a15adf02..4a15adf02 100644
--- a/third_party/aom/stats/aomstats.c
+++ b/media/libaom/src/stats/aomstats.c
diff --git a/third_party/aom/stats/aomstats.h b/media/libaom/src/stats/aomstats.h
index b9c71871a..b9c71871a 100644
--- a/third_party/aom/stats/aomstats.h
+++ b/media/libaom/src/stats/aomstats.h
diff --git a/third_party/aom/stats/rate_hist.c b/media/libaom/src/stats/rate_hist.c
index 71eb78b72..71eb78b72 100644
--- a/third_party/aom/stats/rate_hist.c
+++ b/media/libaom/src/stats/rate_hist.c
diff --git a/third_party/aom/stats/rate_hist.h b/media/libaom/src/stats/rate_hist.h
index 55b8c5d43..55b8c5d43 100644
--- a/third_party/aom/stats/rate_hist.h
+++ b/media/libaom/src/stats/rate_hist.h
diff --git a/third_party/aom/test/accounting_test.cc b/media/libaom/src/test/accounting_test.cc
index 8b5c8af13..8b5c8af13 100644
--- a/third_party/aom/test/accounting_test.cc
+++ b/media/libaom/src/test/accounting_test.cc
diff --git a/third_party/aom/test/acm_random.h b/media/libaom/src/test/acm_random.h
index 0a8317fd5..0a8317fd5 100644
--- a/third_party/aom/test/acm_random.h
+++ b/media/libaom/src/test/acm_random.h
diff --git a/third_party/aom/test/active_map_test.cc b/media/libaom/src/test/active_map_test.cc
index a2b0546ed..a2b0546ed 100644
--- a/third_party/aom/test/active_map_test.cc
+++ b/media/libaom/src/test/active_map_test.cc
diff --git a/third_party/aom/test/altref_test.cc b/media/libaom/src/test/altref_test.cc
index dabb1475a..dabb1475a 100644
--- a/third_party/aom/test/altref_test.cc
+++ b/media/libaom/src/test/altref_test.cc
diff --git a/third_party/aom/test/aom_integer_test.cc b/media/libaom/src/test/aom_integer_test.cc
index fe88a54e9..fe88a54e9 100644
--- a/third_party/aom/test/aom_integer_test.cc
+++ b/media/libaom/src/test/aom_integer_test.cc
diff --git a/third_party/aom/test/aomcx_set_ref.sh b/media/libaom/src/test/aomcx_set_ref.sh
index f51b73c58..f51b73c58 100755..100644
--- a/third_party/aom/test/aomcx_set_ref.sh
+++ b/media/libaom/src/test/aomcx_set_ref.sh
diff --git a/third_party/aom/test/aomdec.sh b/media/libaom/src/test/aomdec.sh
index 927142287..927142287 100755..100644
--- a/third_party/aom/test/aomdec.sh
+++ b/media/libaom/src/test/aomdec.sh
diff --git a/third_party/aom/test/aomenc.sh b/media/libaom/src/test/aomenc.sh
index b030397a3..b030397a3 100755..100644
--- a/third_party/aom/test/aomenc.sh
+++ b/media/libaom/src/test/aomenc.sh
diff --git a/third_party/aom/test/aq_segment_test.cc b/media/libaom/src/test/aq_segment_test.cc
index bbb5027d4..bbb5027d4 100644
--- a/third_party/aom/test/aq_segment_test.cc
+++ b/media/libaom/src/test/aq_segment_test.cc
diff --git a/third_party/aom/test/arf_freq_test.cc b/media/libaom/src/test/arf_freq_test.cc
index 083f4022f..083f4022f 100644
--- a/third_party/aom/test/arf_freq_test.cc
+++ b/media/libaom/src/test/arf_freq_test.cc
diff --git a/third_party/aom/test/av1_config_test.cc b/media/libaom/src/test/av1_config_test.cc
index e2f2c5390..e2f2c5390 100644
--- a/third_party/aom/test/av1_config_test.cc
+++ b/media/libaom/src/test/av1_config_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test.cc b/media/libaom/src/test/av1_convolve_2d_test.cc
index 03286260e..03286260e 100644
--- a/third_party/aom/test/av1_convolve_2d_test.cc
+++ b/media/libaom/src/test/av1_convolve_2d_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.cc b/media/libaom/src/test/av1_convolve_2d_test_util.cc
index 409fd23e1..409fd23e1 100644
--- a/third_party/aom/test/av1_convolve_2d_test_util.cc
+++ b/media/libaom/src/test/av1_convolve_2d_test_util.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.h b/media/libaom/src/test/av1_convolve_2d_test_util.h
index e0eb58410..e0eb58410 100644
--- a/third_party/aom/test/av1_convolve_2d_test_util.h
+++ b/media/libaom/src/test/av1_convolve_2d_test_util.h
diff --git a/third_party/aom/test/av1_convolve_scale_test.cc b/media/libaom/src/test/av1_convolve_scale_test.cc
index 3b1698eeb..3b1698eeb 100644
--- a/third_party/aom/test/av1_convolve_scale_test.cc
+++ b/media/libaom/src/test/av1_convolve_scale_test.cc
diff --git a/third_party/aom/test/av1_encoder_parms_get_to_decoder.cc b/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
index e8470e5d5..e8470e5d5 100644
--- a/third_party/aom/test/av1_encoder_parms_get_to_decoder.cc
+++ b/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
diff --git a/third_party/aom/test/av1_ext_tile_test.cc b/media/libaom/src/test/av1_ext_tile_test.cc
index 424d2f065..424d2f065 100644
--- a/third_party/aom/test/av1_ext_tile_test.cc
+++ b/media/libaom/src/test/av1_ext_tile_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm1d_test.cc b/media/libaom/src/test/av1_fwd_txfm1d_test.cc
index 49a666879..49a666879 100644
--- a/third_party/aom/test/av1_fwd_txfm1d_test.cc
+++ b/media/libaom/src/test/av1_fwd_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm2d_test.cc b/media/libaom/src/test/av1_fwd_txfm2d_test.cc
index 75f20536b..75f20536b 100644
--- a/third_party/aom/test/av1_fwd_txfm2d_test.cc
+++ b/media/libaom/src/test/av1_fwd_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_highbd_iht_test.cc b/media/libaom/src/test/av1_highbd_iht_test.cc
index 2d6490c2a..2d6490c2a 100644
--- a/third_party/aom/test/av1_highbd_iht_test.cc
+++ b/media/libaom/src/test/av1_highbd_iht_test.cc
diff --git a/third_party/aom/test/av1_horz_only_frame_superres_test.cc b/media/libaom/src/test/av1_horz_only_frame_superres_test.cc
index fd77ef35d..fd77ef35d 100644
--- a/third_party/aom/test/av1_horz_only_frame_superres_test.cc
+++ b/media/libaom/src/test/av1_horz_only_frame_superres_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm1d_test.cc b/media/libaom/src/test/av1_inv_txfm1d_test.cc
index bf3a44ed1..bf3a44ed1 100644
--- a/third_party/aom/test/av1_inv_txfm1d_test.cc
+++ b/media/libaom/src/test/av1_inv_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm2d_test.cc b/media/libaom/src/test/av1_inv_txfm2d_test.cc
index 11e231ba6..11e231ba6 100644
--- a/third_party/aom/test/av1_inv_txfm2d_test.cc
+++ b/media/libaom/src/test/av1_inv_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_quantize_test.cc b/media/libaom/src/test/av1_quantize_test.cc
index aaf093918..aaf093918 100644
--- a/third_party/aom/test/av1_quantize_test.cc
+++ b/media/libaom/src/test/av1_quantize_test.cc
diff --git a/third_party/aom/test/av1_round_shift_array_test.cc b/media/libaom/src/test/av1_round_shift_array_test.cc
index 181a39460..181a39460 100644
--- a/third_party/aom/test/av1_round_shift_array_test.cc
+++ b/media/libaom/src/test/av1_round_shift_array_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.cc b/media/libaom/src/test/av1_txfm_test.cc
index d5b0ce325..d5b0ce325 100644
--- a/third_party/aom/test/av1_txfm_test.cc
+++ b/media/libaom/src/test/av1_txfm_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.h b/media/libaom/src/test/av1_txfm_test.h
index a18164741..a18164741 100644
--- a/third_party/aom/test/av1_txfm_test.h
+++ b/media/libaom/src/test/av1_txfm_test.h
diff --git a/third_party/aom/test/av1_wedge_utils_test.cc b/media/libaom/src/test/av1_wedge_utils_test.cc
index e8fbe69a4..e8fbe69a4 100644
--- a/third_party/aom/test/av1_wedge_utils_test.cc
+++ b/media/libaom/src/test/av1_wedge_utils_test.cc
diff --git a/third_party/aom/test/best_encode.sh b/media/libaom/src/test/best_encode.sh
index fe31a01cb..fe31a01cb 100755..100644
--- a/third_party/aom/test/best_encode.sh
+++ b/media/libaom/src/test/best_encode.sh
diff --git a/third_party/aom/test/binary_codes_test.cc b/media/libaom/src/test/binary_codes_test.cc
index 45660cf85..45660cf85 100644
--- a/third_party/aom/test/binary_codes_test.cc
+++ b/media/libaom/src/test/binary_codes_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_1d_test.cc b/media/libaom/src/test/blend_a64_mask_1d_test.cc
index f8844eef8..f8844eef8 100644
--- a/third_party/aom/test/blend_a64_mask_1d_test.cc
+++ b/media/libaom/src/test/blend_a64_mask_1d_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_test.cc b/media/libaom/src/test/blend_a64_mask_test.cc
index 66ca6fc5f..66ca6fc5f 100644
--- a/third_party/aom/test/blend_a64_mask_test.cc
+++ b/media/libaom/src/test/blend_a64_mask_test.cc
diff --git a/third_party/aom/test/blockd_test.cc b/media/libaom/src/test/blockd_test.cc
index ab624007c..ab624007c 100644
--- a/third_party/aom/test/blockd_test.cc
+++ b/media/libaom/src/test/blockd_test.cc
diff --git a/third_party/aom/test/boolcoder_test.cc b/media/libaom/src/test/boolcoder_test.cc
index 680ec1877..680ec1877 100644
--- a/third_party/aom/test/boolcoder_test.cc
+++ b/media/libaom/src/test/boolcoder_test.cc
diff --git a/third_party/aom/test/borders_test.cc b/media/libaom/src/test/borders_test.cc
index 893237ef3..893237ef3 100644
--- a/third_party/aom/test/borders_test.cc
+++ b/media/libaom/src/test/borders_test.cc
diff --git a/third_party/aom/test/cdef_test.cc b/media/libaom/src/test/cdef_test.cc
index becc07291..becc07291 100644
--- a/third_party/aom/test/cdef_test.cc
+++ b/media/libaom/src/test/cdef_test.cc
diff --git a/third_party/aom/test/cfl_test.cc b/media/libaom/src/test/cfl_test.cc
index e4d438d6a..e4d438d6a 100644
--- a/third_party/aom/test/cfl_test.cc
+++ b/media/libaom/src/test/cfl_test.cc
diff --git a/third_party/aom/test/clear_system_state.h b/media/libaom/src/test/clear_system_state.h
index d38ff5dd5..d38ff5dd5 100644
--- a/third_party/aom/test/clear_system_state.h
+++ b/media/libaom/src/test/clear_system_state.h
diff --git a/third_party/aom/test/codec_factory.h b/media/libaom/src/test/codec_factory.h
index dd99110ee..dd99110ee 100644
--- a/third_party/aom/test/codec_factory.h
+++ b/media/libaom/src/test/codec_factory.h
diff --git a/third_party/aom/test/coding_path_sync.cc b/media/libaom/src/test/coding_path_sync.cc
index 6735236cc..6735236cc 100644
--- a/third_party/aom/test/coding_path_sync.cc
+++ b/media/libaom/src/test/coding_path_sync.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.cc b/media/libaom/src/test/comp_avg_pred_test.cc
index 9ad8973f0..9ad8973f0 100644
--- a/third_party/aom/test/comp_avg_pred_test.cc
+++ b/media/libaom/src/test/comp_avg_pred_test.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.h b/media/libaom/src/test/comp_avg_pred_test.h
index 9661dd9f5..9661dd9f5 100644
--- a/third_party/aom/test/comp_avg_pred_test.h
+++ b/media/libaom/src/test/comp_avg_pred_test.h
diff --git a/third_party/aom/test/comp_mask_variance_test.cc b/media/libaom/src/test/comp_mask_variance_test.cc
index 34be2aa6d..34be2aa6d 100644
--- a/third_party/aom/test/comp_mask_variance_test.cc
+++ b/media/libaom/src/test/comp_mask_variance_test.cc
diff --git a/third_party/aom/test/convolve_round_test.cc b/media/libaom/src/test/convolve_round_test.cc
index 2f801e7d4..2f801e7d4 100644
--- a/third_party/aom/test/convolve_round_test.cc
+++ b/media/libaom/src/test/convolve_round_test.cc
diff --git a/third_party/aom/test/convolve_test.cc b/media/libaom/src/test/convolve_test.cc
index de3f47628..de3f47628 100644
--- a/third_party/aom/test/convolve_test.cc
+++ b/media/libaom/src/test/convolve_test.cc
diff --git a/third_party/aom/test/corner_match_test.cc b/media/libaom/src/test/corner_match_test.cc
index 58e3139c5..58e3139c5 100644
--- a/third_party/aom/test/corner_match_test.cc
+++ b/media/libaom/src/test/corner_match_test.cc
diff --git a/third_party/aom/test/cpu_speed_test.cc b/media/libaom/src/test/cpu_speed_test.cc
index 8ea3e6965..8ea3e6965 100644
--- a/third_party/aom/test/cpu_speed_test.cc
+++ b/media/libaom/src/test/cpu_speed_test.cc
diff --git a/third_party/aom/test/datarate_test.cc b/media/libaom/src/test/datarate_test.cc
index 1588d3cc1..1588d3cc1 100644
--- a/third_party/aom/test/datarate_test.cc
+++ b/media/libaom/src/test/datarate_test.cc
diff --git a/third_party/aom/test/decode_api_test.cc b/media/libaom/src/test/decode_api_test.cc
index c1beacee1..c1beacee1 100644
--- a/third_party/aom/test/decode_api_test.cc
+++ b/media/libaom/src/test/decode_api_test.cc
diff --git a/third_party/aom/test/decode_multithreaded_test.cc b/media/libaom/src/test/decode_multithreaded_test.cc
index cea1d144f..cea1d144f 100644
--- a/third_party/aom/test/decode_multithreaded_test.cc
+++ b/media/libaom/src/test/decode_multithreaded_test.cc
diff --git a/third_party/aom/test/decode_perf_test.cc b/media/libaom/src/test/decode_perf_test.cc
index bb7b00032..bb7b00032 100644
--- a/third_party/aom/test/decode_perf_test.cc
+++ b/media/libaom/src/test/decode_perf_test.cc
diff --git a/third_party/aom/test/decode_test_driver.cc b/media/libaom/src/test/decode_test_driver.cc
index 70de0cff6..70de0cff6 100644
--- a/third_party/aom/test/decode_test_driver.cc
+++ b/media/libaom/src/test/decode_test_driver.cc
diff --git a/third_party/aom/test/decode_test_driver.h b/media/libaom/src/test/decode_test_driver.h
index d13e13ea1..d13e13ea1 100644
--- a/third_party/aom/test/decode_test_driver.h
+++ b/media/libaom/src/test/decode_test_driver.h
diff --git a/third_party/aom/test/decode_to_md5.sh b/media/libaom/src/test/decode_to_md5.sh
index 2edd1cb52..2edd1cb52 100755..100644
--- a/third_party/aom/test/decode_to_md5.sh
+++ b/media/libaom/src/test/decode_to_md5.sh
diff --git a/third_party/aom/test/decode_with_drops.sh b/media/libaom/src/test/decode_with_drops.sh
index 155ee9207..155ee9207 100755..100644
--- a/third_party/aom/test/decode_with_drops.sh
+++ b/media/libaom/src/test/decode_with_drops.sh
diff --git a/third_party/aom/test/divu_small_test.cc b/media/libaom/src/test/divu_small_test.cc
index 064f8ee45..064f8ee45 100644
--- a/third_party/aom/test/divu_small_test.cc
+++ b/media/libaom/src/test/divu_small_test.cc
diff --git a/third_party/aom/test/dr_prediction_test.cc b/media/libaom/src/test/dr_prediction_test.cc
index ff2c1de4e..ff2c1de4e 100644
--- a/third_party/aom/test/dr_prediction_test.cc
+++ b/media/libaom/src/test/dr_prediction_test.cc
diff --git a/third_party/aom/test/dump_obu.sh b/media/libaom/src/test/dump_obu.sh
index da44dd7e6..da44dd7e6 100755..100644
--- a/third_party/aom/test/dump_obu.sh
+++ b/media/libaom/src/test/dump_obu.sh
diff --git a/third_party/aom/test/ec_test.cc b/media/libaom/src/test/ec_test.cc
index e6a5ea63b..e6a5ea63b 100644
--- a/third_party/aom/test/ec_test.cc
+++ b/media/libaom/src/test/ec_test.cc
diff --git a/third_party/aom/test/encode_api_test.cc b/media/libaom/src/test/encode_api_test.cc
index c26f5720f..c26f5720f 100644
--- a/third_party/aom/test/encode_api_test.cc
+++ b/media/libaom/src/test/encode_api_test.cc
diff --git a/third_party/aom/test/encode_perf_test.cc b/media/libaom/src/test/encode_perf_test.cc
index fe649b153..fe649b153 100644
--- a/third_party/aom/test/encode_perf_test.cc
+++ b/media/libaom/src/test/encode_perf_test.cc
diff --git a/third_party/aom/test/encode_test_driver.cc b/media/libaom/src/test/encode_test_driver.cc
index f3d61dc36..f3d61dc36 100644
--- a/third_party/aom/test/encode_test_driver.cc
+++ b/media/libaom/src/test/encode_test_driver.cc
diff --git a/third_party/aom/test/encode_test_driver.h b/media/libaom/src/test/encode_test_driver.h
index 4f3f855cf..4f3f855cf 100644
--- a/third_party/aom/test/encode_test_driver.h
+++ b/media/libaom/src/test/encode_test_driver.h
diff --git a/third_party/aom/test/encodetxb_test.cc b/media/libaom/src/test/encodetxb_test.cc
index 11cc07368..11cc07368 100644
--- a/third_party/aom/test/encodetxb_test.cc
+++ b/media/libaom/src/test/encodetxb_test.cc
diff --git a/third_party/aom/test/end_to_end_test.cc b/media/libaom/src/test/end_to_end_test.cc
index 1ac0ae931..1ac0ae931 100644
--- a/third_party/aom/test/end_to_end_test.cc
+++ b/media/libaom/src/test/end_to_end_test.cc
diff --git a/third_party/aom/test/error_block_test.cc b/media/libaom/src/test/error_block_test.cc
index 353947c3d..353947c3d 100644
--- a/third_party/aom/test/error_block_test.cc
+++ b/media/libaom/src/test/error_block_test.cc
diff --git a/third_party/aom/test/error_resilience_test.cc b/media/libaom/src/test/error_resilience_test.cc
index 13ac0bf93..13ac0bf93 100644
--- a/third_party/aom/test/error_resilience_test.cc
+++ b/media/libaom/src/test/error_resilience_test.cc
diff --git a/third_party/aom/test/ethread_test.cc b/media/libaom/src/test/ethread_test.cc
index d9ac78282..d9ac78282 100644
--- a/third_party/aom/test/ethread_test.cc
+++ b/media/libaom/src/test/ethread_test.cc
diff --git a/third_party/aom/test/examples.sh b/media/libaom/src/test/examples.sh
index 2cdb89dd0..2cdb89dd0 100755..100644
--- a/third_party/aom/test/examples.sh
+++ b/media/libaom/src/test/examples.sh
diff --git a/third_party/aom/test/external_frame_buffer_test.cc b/media/libaom/src/test/external_frame_buffer_test.cc
index c2af059a4..c2af059a4 100644
--- a/third_party/aom/test/external_frame_buffer_test.cc
+++ b/media/libaom/src/test/external_frame_buffer_test.cc
diff --git a/third_party/aom/test/fft_test.cc b/media/libaom/src/test/fft_test.cc
index e24e451a3..e24e451a3 100644
--- a/third_party/aom/test/fft_test.cc
+++ b/media/libaom/src/test/fft_test.cc
diff --git a/third_party/aom/test/film_grain_table_test.cc b/media/libaom/src/test/film_grain_table_test.cc
index 524d67d7b..524d67d7b 100644
--- a/third_party/aom/test/film_grain_table_test.cc
+++ b/media/libaom/src/test/film_grain_table_test.cc
diff --git a/third_party/aom/test/filterintra_test.cc b/media/libaom/src/test/filterintra_test.cc
index 597134940..597134940 100644
--- a/third_party/aom/test/filterintra_test.cc
+++ b/media/libaom/src/test/filterintra_test.cc
diff --git a/third_party/aom/test/frame_size_tests.cc b/media/libaom/src/test/frame_size_tests.cc
index eaf0b8370..eaf0b8370 100644
--- a/third_party/aom/test/frame_size_tests.cc
+++ b/media/libaom/src/test/frame_size_tests.cc
diff --git a/third_party/aom/test/function_equivalence_test.h b/media/libaom/src/test/function_equivalence_test.h
index f27068902..f27068902 100644
--- a/third_party/aom/test/function_equivalence_test.h
+++ b/media/libaom/src/test/function_equivalence_test.h
diff --git a/third_party/aom/test/fwht4x4_test.cc b/media/libaom/src/test/fwht4x4_test.cc
index c8d98c519..c8d98c519 100644
--- a/third_party/aom/test/fwht4x4_test.cc
+++ b/media/libaom/src/test/fwht4x4_test.cc
diff --git a/third_party/aom/test/gviz_api.py b/media/libaom/src/test/gviz_api.py
index d3a443dab..d3a443dab 100755..100644
--- a/third_party/aom/test/gviz_api.py
+++ b/media/libaom/src/test/gviz_api.py
diff --git a/third_party/aom/test/hash_test.cc b/media/libaom/src/test/hash_test.cc
index e9f7f63c9..e9f7f63c9 100644
--- a/third_party/aom/test/hash_test.cc
+++ b/media/libaom/src/test/hash_test.cc
diff --git a/third_party/aom/test/hbd_metrics_test.cc b/media/libaom/src/test/hbd_metrics_test.cc
index 09df9bde4..09df9bde4 100644
--- a/third_party/aom/test/hbd_metrics_test.cc
+++ b/media/libaom/src/test/hbd_metrics_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test.cc b/media/libaom/src/test/hiprec_convolve_test.cc
index f94a0730c..f94a0730c 100644
--- a/third_party/aom/test/hiprec_convolve_test.cc
+++ b/media/libaom/src/test/hiprec_convolve_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.cc b/media/libaom/src/test/hiprec_convolve_test_util.cc
index 2672bcec3..2672bcec3 100644
--- a/third_party/aom/test/hiprec_convolve_test_util.cc
+++ b/media/libaom/src/test/hiprec_convolve_test_util.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.h b/media/libaom/src/test/hiprec_convolve_test_util.h
index 2abe24b57..2abe24b57 100644
--- a/third_party/aom/test/hiprec_convolve_test_util.h
+++ b/media/libaom/src/test/hiprec_convolve_test_util.h
diff --git a/third_party/aom/test/horz_superres_test.cc b/media/libaom/src/test/horz_superres_test.cc
index 973f55b66..973f55b66 100644
--- a/third_party/aom/test/horz_superres_test.cc
+++ b/media/libaom/src/test/horz_superres_test.cc
diff --git a/third_party/aom/test/i420_video_source.h b/media/libaom/src/test/i420_video_source.h
index 233e7152b..233e7152b 100644
--- a/third_party/aom/test/i420_video_source.h
+++ b/media/libaom/src/test/i420_video_source.h
diff --git a/third_party/aom/test/intra_edge_test.cc b/media/libaom/src/test/intra_edge_test.cc
index ce61402ac..ce61402ac 100644
--- a/third_party/aom/test/intra_edge_test.cc
+++ b/media/libaom/src/test/intra_edge_test.cc
diff --git a/third_party/aom/test/intrabc_test.cc b/media/libaom/src/test/intrabc_test.cc
index 3ea421708..3ea421708 100644
--- a/third_party/aom/test/intrabc_test.cc
+++ b/media/libaom/src/test/intrabc_test.cc
diff --git a/third_party/aom/test/intrapred_test.cc b/media/libaom/src/test/intrapred_test.cc
index 1a1c0fc42..1a1c0fc42 100644
--- a/third_party/aom/test/intrapred_test.cc
+++ b/media/libaom/src/test/intrapred_test.cc
diff --git a/third_party/aom/test/invalid_file_test.cc b/media/libaom/src/test/invalid_file_test.cc
index 5b4f5a6c3..5b4f5a6c3 100644
--- a/third_party/aom/test/invalid_file_test.cc
+++ b/media/libaom/src/test/invalid_file_test.cc
diff --git a/third_party/aom/test/ivf_video_source.h b/media/libaom/src/test/ivf_video_source.h
index ff2841445..ff2841445 100644
--- a/third_party/aom/test/ivf_video_source.h
+++ b/media/libaom/src/test/ivf_video_source.h
diff --git a/third_party/aom/test/lightfield_test.sh b/media/libaom/src/test/lightfield_test.sh
index b957a6b79..b957a6b79 100755..100644
--- a/third_party/aom/test/lightfield_test.sh
+++ b/media/libaom/src/test/lightfield_test.sh
diff --git a/third_party/aom/test/log2_test.cc b/media/libaom/src/test/log2_test.cc
index d7840c68b..d7840c68b 100644
--- a/third_party/aom/test/log2_test.cc
+++ b/media/libaom/src/test/log2_test.cc
diff --git a/third_party/aom/test/lossless_test.cc b/media/libaom/src/test/lossless_test.cc
index 3f8e89c81..3f8e89c81 100644
--- a/third_party/aom/test/lossless_test.cc
+++ b/media/libaom/src/test/lossless_test.cc
diff --git a/third_party/aom/test/lpf_test.cc b/media/libaom/src/test/lpf_test.cc
index 451bffd2a..451bffd2a 100644
--- a/third_party/aom/test/lpf_test.cc
+++ b/media/libaom/src/test/lpf_test.cc
diff --git a/third_party/aom/test/masked_sad_test.cc b/media/libaom/src/test/masked_sad_test.cc
index 311f1877d..311f1877d 100644
--- a/third_party/aom/test/masked_sad_test.cc
+++ b/media/libaom/src/test/masked_sad_test.cc
diff --git a/third_party/aom/test/masked_variance_test.cc b/media/libaom/src/test/masked_variance_test.cc
index 275b9feb6..275b9feb6 100644
--- a/third_party/aom/test/masked_variance_test.cc
+++ b/media/libaom/src/test/masked_variance_test.cc
diff --git a/third_party/aom/test/md5_helper.h b/media/libaom/src/test/md5_helper.h
index 9443cb262..9443cb262 100644
--- a/third_party/aom/test/md5_helper.h
+++ b/media/libaom/src/test/md5_helper.h
diff --git a/third_party/aom/test/metrics_template.html b/media/libaom/src/test/metrics_template.html
index b57c62314..b57c62314 100644
--- a/third_party/aom/test/metrics_template.html
+++ b/media/libaom/src/test/metrics_template.html
diff --git a/third_party/aom/test/monochrome_test.cc b/media/libaom/src/test/monochrome_test.cc
index ebccba584..ebccba584 100644
--- a/third_party/aom/test/monochrome_test.cc
+++ b/media/libaom/src/test/monochrome_test.cc
diff --git a/third_party/aom/test/motion_vector_test.cc b/media/libaom/src/test/motion_vector_test.cc
index 27eb93893..27eb93893 100644
--- a/third_party/aom/test/motion_vector_test.cc
+++ b/media/libaom/src/test/motion_vector_test.cc
diff --git a/third_party/aom/test/noise_model_test.cc b/media/libaom/src/test/noise_model_test.cc
index b5b387e31..b5b387e31 100644
--- a/third_party/aom/test/noise_model_test.cc
+++ b/media/libaom/src/test/noise_model_test.cc
diff --git a/third_party/aom/test/obmc_sad_test.cc b/media/libaom/src/test/obmc_sad_test.cc
index 6cef86961..6cef86961 100644
--- a/third_party/aom/test/obmc_sad_test.cc
+++ b/media/libaom/src/test/obmc_sad_test.cc
diff --git a/third_party/aom/test/obmc_variance_test.cc b/media/libaom/src/test/obmc_variance_test.cc
index 4563b964a..4563b964a 100644
--- a/third_party/aom/test/obmc_variance_test.cc
+++ b/media/libaom/src/test/obmc_variance_test.cc
diff --git a/third_party/aom/test/onyxc_int_test.cc b/media/libaom/src/test/onyxc_int_test.cc
index 388959518..388959518 100644
--- a/third_party/aom/test/onyxc_int_test.cc
+++ b/media/libaom/src/test/onyxc_int_test.cc
diff --git a/third_party/aom/test/pickrst_test.cc b/media/libaom/src/test/pickrst_test.cc
index 040e8e8b7..040e8e8b7 100644
--- a/third_party/aom/test/pickrst_test.cc
+++ b/media/libaom/src/test/pickrst_test.cc
diff --git a/third_party/aom/test/qm_test.cc b/media/libaom/src/test/qm_test.cc
index c87506b41..c87506b41 100644
--- a/third_party/aom/test/qm_test.cc
+++ b/media/libaom/src/test/qm_test.cc
diff --git a/third_party/aom/test/quantize_func_test.cc b/media/libaom/src/test/quantize_func_test.cc
index 554d0c721..554d0c721 100644
--- a/third_party/aom/test/quantize_func_test.cc
+++ b/media/libaom/src/test/quantize_func_test.cc
diff --git a/third_party/aom/test/reconinter_test.cc b/media/libaom/src/test/reconinter_test.cc
index a8536e517..a8536e517 100644
--- a/third_party/aom/test/reconinter_test.cc
+++ b/media/libaom/src/test/reconinter_test.cc
diff --git a/third_party/aom/test/register_state_check.h b/media/libaom/src/test/register_state_check.h
index d404621dd..d404621dd 100644
--- a/third_party/aom/test/register_state_check.h
+++ b/media/libaom/src/test/register_state_check.h
diff --git a/third_party/aom/test/resize_test.cc b/media/libaom/src/test/resize_test.cc
index b270b8362..b270b8362 100644
--- a/third_party/aom/test/resize_test.cc
+++ b/media/libaom/src/test/resize_test.cc
diff --git a/third_party/aom/test/run_encodes.sh b/media/libaom/src/test/run_encodes.sh
index 2096d8b15..2096d8b15 100755..100644
--- a/third_party/aom/test/run_encodes.sh
+++ b/media/libaom/src/test/run_encodes.sh
diff --git a/third_party/aom/test/sad_test.cc b/media/libaom/src/test/sad_test.cc
index 845fe79da..845fe79da 100644
--- a/third_party/aom/test/sad_test.cc
+++ b/media/libaom/src/test/sad_test.cc
diff --git a/third_party/aom/test/scalability_test.cc b/media/libaom/src/test/scalability_test.cc
index b39918861..b39918861 100644
--- a/third_party/aom/test/scalability_test.cc
+++ b/media/libaom/src/test/scalability_test.cc
diff --git a/third_party/aom/test/scan_test.cc b/media/libaom/src/test/scan_test.cc
index dee2ab5a6..dee2ab5a6 100644
--- a/third_party/aom/test/scan_test.cc
+++ b/media/libaom/src/test/scan_test.cc
diff --git a/third_party/aom/test/segment_binarization_sync.cc b/media/libaom/src/test/segment_binarization_sync.cc
index bd8cf1141..bd8cf1141 100644
--- a/third_party/aom/test/segment_binarization_sync.cc
+++ b/media/libaom/src/test/segment_binarization_sync.cc
diff --git a/third_party/aom/test/selfguided_filter_test.cc b/media/libaom/src/test/selfguided_filter_test.cc
index d2d5c6105..d2d5c6105 100644
--- a/third_party/aom/test/selfguided_filter_test.cc
+++ b/media/libaom/src/test/selfguided_filter_test.cc
diff --git a/third_party/aom/test/set_maps.sh b/media/libaom/src/test/set_maps.sh
index 4f59b06d6..4f59b06d6 100755..100644
--- a/third_party/aom/test/set_maps.sh
+++ b/media/libaom/src/test/set_maps.sh
diff --git a/third_party/aom/test/simd_avx2_test.cc b/media/libaom/src/test/simd_avx2_test.cc
index 8a012bff8..8a012bff8 100644
--- a/third_party/aom/test/simd_avx2_test.cc
+++ b/media/libaom/src/test/simd_avx2_test.cc
diff --git a/third_party/aom/test/simd_cmp_avx2.cc b/media/libaom/src/test/simd_cmp_avx2.cc
index cda632bcd..cda632bcd 100644
--- a/third_party/aom/test/simd_cmp_avx2.cc
+++ b/media/libaom/src/test/simd_cmp_avx2.cc
diff --git a/third_party/aom/test/simd_cmp_impl.h b/media/libaom/src/test/simd_cmp_impl.h
index b98af9aad..b98af9aad 100644
--- a/third_party/aom/test/simd_cmp_impl.h
+++ b/media/libaom/src/test/simd_cmp_impl.h
diff --git a/third_party/aom/test/simd_cmp_neon.cc b/media/libaom/src/test/simd_cmp_neon.cc
index 53c1e2a07..53c1e2a07 100644
--- a/third_party/aom/test/simd_cmp_neon.cc
+++ b/media/libaom/src/test/simd_cmp_neon.cc
diff --git a/third_party/aom/test/simd_cmp_sse2.cc b/media/libaom/src/test/simd_cmp_sse2.cc
index f7827a7fa..f7827a7fa 100644
--- a/third_party/aom/test/simd_cmp_sse2.cc
+++ b/media/libaom/src/test/simd_cmp_sse2.cc
diff --git a/third_party/aom/test/simd_cmp_sse4.cc b/media/libaom/src/test/simd_cmp_sse4.cc
index 3566764b6..3566764b6 100644
--- a/third_party/aom/test/simd_cmp_sse4.cc
+++ b/media/libaom/src/test/simd_cmp_sse4.cc
diff --git a/third_party/aom/test/simd_cmp_ssse3.cc b/media/libaom/src/test/simd_cmp_ssse3.cc
index 57bf135dd..57bf135dd 100644
--- a/third_party/aom/test/simd_cmp_ssse3.cc
+++ b/media/libaom/src/test/simd_cmp_ssse3.cc
diff --git a/third_party/aom/test/simd_impl.h b/media/libaom/src/test/simd_impl.h
index fd06f67fd..fd06f67fd 100644
--- a/third_party/aom/test/simd_impl.h
+++ b/media/libaom/src/test/simd_impl.h
diff --git a/third_party/aom/test/simd_neon_test.cc b/media/libaom/src/test/simd_neon_test.cc
index b67b18895..b67b18895 100644
--- a/third_party/aom/test/simd_neon_test.cc
+++ b/media/libaom/src/test/simd_neon_test.cc
diff --git a/third_party/aom/test/simd_sse2_test.cc b/media/libaom/src/test/simd_sse2_test.cc
index b37a931b3..b37a931b3 100644
--- a/third_party/aom/test/simd_sse2_test.cc
+++ b/media/libaom/src/test/simd_sse2_test.cc
diff --git a/third_party/aom/test/simd_sse4_test.cc b/media/libaom/src/test/simd_sse4_test.cc
index b1c9d5cd8..b1c9d5cd8 100644
--- a/third_party/aom/test/simd_sse4_test.cc
+++ b/media/libaom/src/test/simd_sse4_test.cc
diff --git a/third_party/aom/test/simd_ssse3_test.cc b/media/libaom/src/test/simd_ssse3_test.cc
index d95c26fb5..d95c26fb5 100644
--- a/third_party/aom/test/simd_ssse3_test.cc
+++ b/media/libaom/src/test/simd_ssse3_test.cc
diff --git a/third_party/aom/test/simple_decoder.sh b/media/libaom/src/test/simple_decoder.sh
index 5f39ad206..5f39ad206 100755..100644
--- a/third_party/aom/test/simple_decoder.sh
+++ b/media/libaom/src/test/simple_decoder.sh
diff --git a/third_party/aom/test/simple_encoder.sh b/media/libaom/src/test/simple_encoder.sh
index 5cd6b46a1..5cd6b46a1 100755..100644
--- a/third_party/aom/test/simple_encoder.sh
+++ b/media/libaom/src/test/simple_encoder.sh
diff --git a/third_party/aom/test/subtract_test.cc b/media/libaom/src/test/subtract_test.cc
index 7dcedf56d..7dcedf56d 100644
--- a/third_party/aom/test/subtract_test.cc
+++ b/media/libaom/src/test/subtract_test.cc
diff --git a/third_party/aom/test/sum_squares_test.cc b/media/libaom/src/test/sum_squares_test.cc
index f10998498..f10998498 100644
--- a/third_party/aom/test/sum_squares_test.cc
+++ b/media/libaom/src/test/sum_squares_test.cc
diff --git a/third_party/aom/test/superframe_test.cc b/media/libaom/src/test/superframe_test.cc
index 7be18f72a..7be18f72a 100644
--- a/third_party/aom/test/superframe_test.cc
+++ b/media/libaom/src/test/superframe_test.cc
diff --git a/third_party/aom/test/test-data.sha1 b/media/libaom/src/test/test-data.sha1
index b6ee34701..b6ee34701 100644
--- a/third_party/aom/test/test-data.sha1
+++ b/media/libaom/src/test/test-data.sha1
diff --git a/third_party/aom/test/test.cmake b/media/libaom/src/test/test.cmake
index b16ae14c3..b16ae14c3 100644
--- a/third_party/aom/test/test.cmake
+++ b/media/libaom/src/test/test.cmake
diff --git a/third_party/aom/test/test_data_download_worker.cmake b/media/libaom/src/test/test_data_download_worker.cmake
index dc803497d..dc803497d 100644
--- a/third_party/aom/test/test_data_download_worker.cmake
+++ b/media/libaom/src/test/test_data_download_worker.cmake
diff --git a/third_party/aom/test/test_data_util.cmake b/media/libaom/src/test/test_data_util.cmake
index 45c951478..45c951478 100644
--- a/third_party/aom/test/test_data_util.cmake
+++ b/media/libaom/src/test/test_data_util.cmake
diff --git a/third_party/aom/test/test_intra_pred_speed.cc b/media/libaom/src/test/test_intra_pred_speed.cc
index b72ac1167..b72ac1167 100644
--- a/third_party/aom/test/test_intra_pred_speed.cc
+++ b/media/libaom/src/test/test_intra_pred_speed.cc
diff --git a/third_party/aom/test/test_libaom.cc b/media/libaom/src/test/test_libaom.cc
index b55d76237..b55d76237 100644
--- a/third_party/aom/test/test_libaom.cc
+++ b/media/libaom/src/test/test_libaom.cc
diff --git a/third_party/aom/test/test_runner.cmake b/media/libaom/src/test/test_runner.cmake
index d3747b1e3..d3747b1e3 100644
--- a/third_party/aom/test/test_runner.cmake
+++ b/media/libaom/src/test/test_runner.cmake
diff --git a/third_party/aom/test/test_vector_test.cc b/media/libaom/src/test/test_vector_test.cc
index 286988b17..286988b17 100644
--- a/third_party/aom/test/test_vector_test.cc
+++ b/media/libaom/src/test/test_vector_test.cc
diff --git a/third_party/aom/test/test_vectors.cc b/media/libaom/src/test/test_vectors.cc
index 71e431e18..71e431e18 100644
--- a/third_party/aom/test/test_vectors.cc
+++ b/media/libaom/src/test/test_vectors.cc
diff --git a/third_party/aom/test/test_vectors.h b/media/libaom/src/test/test_vectors.h
index be37f6e37..be37f6e37 100644
--- a/third_party/aom/test/test_vectors.h
+++ b/media/libaom/src/test/test_vectors.h
diff --git a/third_party/aom/test/tile_independence_test.cc b/media/libaom/src/test/tile_independence_test.cc
index cf534c0c5..cf534c0c5 100644
--- a/third_party/aom/test/tile_independence_test.cc
+++ b/media/libaom/src/test/tile_independence_test.cc
diff --git a/third_party/aom/test/tools_common.sh b/media/libaom/src/test/tools_common.sh
index c08710606..c08710606 100755..100644
--- a/third_party/aom/test/tools_common.sh
+++ b/media/libaom/src/test/tools_common.sh
diff --git a/third_party/aom/test/transform_test_base.h b/media/libaom/src/test/transform_test_base.h
index 8ebcf5ff7..8ebcf5ff7 100644
--- a/third_party/aom/test/transform_test_base.h
+++ b/media/libaom/src/test/transform_test_base.h
diff --git a/third_party/aom/test/twopass_encoder.sh b/media/libaom/src/test/twopass_encoder.sh
index cca44ced8..cca44ced8 100755..100644
--- a/third_party/aom/test/twopass_encoder.sh
+++ b/media/libaom/src/test/twopass_encoder.sh
diff --git a/third_party/aom/test/util.h b/media/libaom/src/test/util.h
index c3f4e4442..c3f4e4442 100644
--- a/third_party/aom/test/util.h
+++ b/media/libaom/src/test/util.h
diff --git a/third_party/aom/test/variance_test.cc b/media/libaom/src/test/variance_test.cc
index 0df314b0f..0df314b0f 100644
--- a/third_party/aom/test/variance_test.cc
+++ b/media/libaom/src/test/variance_test.cc
diff --git a/third_party/aom/test/video_source.h b/media/libaom/src/test/video_source.h
index 3c1c5e559..3c1c5e559 100644
--- a/third_party/aom/test/video_source.h
+++ b/media/libaom/src/test/video_source.h
diff --git a/third_party/aom/test/visual_metrics.py b/media/libaom/src/test/visual_metrics.py
index 9055feb33..9055feb33 100755..100644
--- a/third_party/aom/test/visual_metrics.py
+++ b/media/libaom/src/test/visual_metrics.py
diff --git a/third_party/aom/test/warp_filter_test.cc b/media/libaom/src/test/warp_filter_test.cc
index 19a4e8b6a..19a4e8b6a 100644
--- a/third_party/aom/test/warp_filter_test.cc
+++ b/media/libaom/src/test/warp_filter_test.cc
diff --git a/third_party/aom/test/warp_filter_test_util.cc b/media/libaom/src/test/warp_filter_test_util.cc
index 69b2ed4af..69b2ed4af 100644
--- a/third_party/aom/test/warp_filter_test_util.cc
+++ b/media/libaom/src/test/warp_filter_test_util.cc
diff --git a/third_party/aom/test/warp_filter_test_util.h b/media/libaom/src/test/warp_filter_test_util.h
index b8998e5c8..b8998e5c8 100644
--- a/third_party/aom/test/warp_filter_test_util.h
+++ b/media/libaom/src/test/warp_filter_test_util.h
diff --git a/third_party/aom/test/webm_video_source.h b/media/libaom/src/test/webm_video_source.h
index bb3d11735..bb3d11735 100644
--- a/third_party/aom/test/webm_video_source.h
+++ b/media/libaom/src/test/webm_video_source.h
diff --git a/third_party/aom/test/wiener_test.cc b/media/libaom/src/test/wiener_test.cc
index dfec09119..dfec09119 100644
--- a/third_party/aom/test/wiener_test.cc
+++ b/media/libaom/src/test/wiener_test.cc
diff --git a/third_party/aom/test/y4m_test.cc b/media/libaom/src/test/y4m_test.cc
index 6cc75ef5b..6cc75ef5b 100644
--- a/third_party/aom/test/y4m_test.cc
+++ b/media/libaom/src/test/y4m_test.cc
diff --git a/third_party/aom/test/y4m_video_source.h b/media/libaom/src/test/y4m_video_source.h
index 3dea901e6..3dea901e6 100644
--- a/third_party/aom/test/y4m_video_source.h
+++ b/media/libaom/src/test/y4m_video_source.h
diff --git a/third_party/aom/test/yuv_video_source.h b/media/libaom/src/test/yuv_video_source.h
index 774ecc008..774ecc008 100644
--- a/third_party/aom/test/yuv_video_source.h
+++ b/media/libaom/src/test/yuv_video_source.h
diff --git a/third_party/aom/third_party/fastfeat/LICENSE b/media/libaom/src/third_party/fastfeat/LICENSE
index f347008d6..f347008d6 100644
--- a/third_party/aom/third_party/fastfeat/LICENSE
+++ b/media/libaom/src/third_party/fastfeat/LICENSE
diff --git a/third_party/aom/third_party/fastfeat/README.libvpx b/media/libaom/src/third_party/fastfeat/README.libvpx
index 1e58a303b..1e58a303b 100644
--- a/third_party/aom/third_party/fastfeat/README.libvpx
+++ b/media/libaom/src/third_party/fastfeat/README.libvpx
diff --git a/third_party/aom/third_party/fastfeat/fast.c b/media/libaom/src/third_party/fastfeat/fast.c
index 0d7efc154..0d7efc154 100644
--- a/third_party/aom/third_party/fastfeat/fast.c
+++ b/media/libaom/src/third_party/fastfeat/fast.c
diff --git a/third_party/aom/third_party/fastfeat/fast.h b/media/libaom/src/third_party/fastfeat/fast.h
index a00730e3d..a00730e3d 100644
--- a/third_party/aom/third_party/fastfeat/fast.h
+++ b/media/libaom/src/third_party/fastfeat/fast.h
diff --git a/third_party/aom/third_party/fastfeat/fast_9.c b/media/libaom/src/third_party/fastfeat/fast_9.c
index ec167a953..ec167a953 100644
--- a/third_party/aom/third_party/fastfeat/fast_9.c
+++ b/media/libaom/src/third_party/fastfeat/fast_9.c
diff --git a/third_party/aom/third_party/fastfeat/nonmax.c b/media/libaom/src/third_party/fastfeat/nonmax.c
index 0438c4dc1..0438c4dc1 100644
--- a/third_party/aom/third_party/fastfeat/nonmax.c
+++ b/media/libaom/src/third_party/fastfeat/nonmax.c
diff --git a/third_party/aom/third_party/googletest/README.libaom b/media/libaom/src/third_party/googletest/README.libaom
index 9784dd51b..9784dd51b 100644
--- a/third_party/aom/third_party/googletest/README.libaom
+++ b/media/libaom/src/third_party/googletest/README.libaom
diff --git a/third_party/aom/third_party/googletest/gtest.mk b/media/libaom/src/third_party/googletest/gtest.mk
index fc4dbdc24..fc4dbdc24 100644
--- a/third_party/aom/third_party/googletest/gtest.mk
+++ b/media/libaom/src/third_party/googletest/gtest.mk
diff --git a/third_party/aom/third_party/googletest/src/googletest/CHANGES b/media/libaom/src/third_party/googletest/src/googletest/CHANGES
index 055213242..055213242 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CHANGES
+++ b/media/libaom/src/third_party/googletest/src/googletest/CHANGES
diff --git a/third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt b/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
index 621d0f042..621d0f042 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt
+++ b/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
diff --git a/third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS b/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
index feae2fc04..feae2fc04 100644
--- a/third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS
+++ b/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
diff --git a/third_party/aom/third_party/googletest/src/googletest/LICENSE b/media/libaom/src/third_party/googletest/src/googletest/LICENSE
index 1941a11f8..1941a11f8 100644
--- a/third_party/aom/third_party/googletest/src/googletest/LICENSE
+++ b/media/libaom/src/third_party/googletest/src/googletest/LICENSE
diff --git a/third_party/aom/third_party/googletest/src/googletest/README.md b/media/libaom/src/third_party/googletest/src/googletest/README.md
index edd440805..edd440805 100644
--- a/third_party/aom/third_party/googletest/src/googletest/README.md
+++ b/media/libaom/src/third_party/googletest/src/googletest/README.md
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake b/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
index 777b91ed4..777b91ed4 100644
--- a/third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake
+++ b/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
index 957a69c6a..957a69c6a 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
index fe879bca7..fe879bca7 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
index 038f9ba79..038f9ba79 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
index 3078d6d2a..3078d6d2a 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
index 8a33164cb..8a33164cb 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
index f63fa9a1b..f63fa9a1b 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
index 77eb84483..77eb84483 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
index 5f69d5678..5f69d5678 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
index f846c5bd6..f846c5bd6 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
index 30ae712f5..30ae712f5 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
index da80ddc6c..da80ddc6c 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
index 7e744bd3b..7e744bd3b 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
index 60c1ea050..60c1ea050 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
index c27412a89..c27412a89 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
index 2b3a78f5b..2b3a78f5b 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
index 7a13b4b0d..7a13b4b0d 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
index ebd1cf615..ebd1cf615 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
index 360294221..360294221 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
index 4d1d81d20..4d1d81d20 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
index 5c7c47af0..5c7c47af0 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
index 82cab9b02..82cab9b02 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
index 74ab94905..74ab94905 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
index da57e65d3..da57e65d3 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
index 97f1a7fdd..97f1a7fdd 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
index e9b405340..e9b405340 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
index 429ddfeec..429ddfeec 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
index e46f7cfcb..e46f7cfcb 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
index 251fdf025..251fdf025 100644
--- a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
+++ b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
index 0a9cee522..0a9cee522 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
index a01a36983..a01a36983 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
index 0292dc119..0292dc119 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
index ed8a682a9..ed8a682a9 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
index e5bf3dd2b..e5bf3dd2b 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
index a2df412f8..a2df412f8 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
index fb0e35425..fb0e35425 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
index df1eef475..df1eef475 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
index 5a8932c73..5a8932c73 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
index f30282255..f30282255 100644
--- a/third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc
+++ b/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
diff --git a/third_party/aom/third_party/libwebm/AUTHORS.TXT b/media/libaom/src/third_party/libwebm/AUTHORS.TXT
index 9686ac13e..9686ac13e 100644
--- a/third_party/aom/third_party/libwebm/AUTHORS.TXT
+++ b/media/libaom/src/third_party/libwebm/AUTHORS.TXT
diff --git a/third_party/aom/third_party/libwebm/Android.mk b/media/libaom/src/third_party/libwebm/Android.mk
index b46ba101d..b46ba101d 100644
--- a/third_party/aom/third_party/libwebm/Android.mk
+++ b/media/libaom/src/third_party/libwebm/Android.mk
diff --git a/third_party/aom/third_party/libwebm/LICENSE.TXT b/media/libaom/src/third_party/libwebm/LICENSE.TXT
index 7a6f99547..7a6f99547 100644
--- a/third_party/aom/third_party/libwebm/LICENSE.TXT
+++ b/media/libaom/src/third_party/libwebm/LICENSE.TXT
diff --git a/third_party/aom/third_party/libwebm/PATENTS.TXT b/media/libaom/src/third_party/libwebm/PATENTS.TXT
index caedf607e..caedf607e 100644
--- a/third_party/aom/third_party/libwebm/PATENTS.TXT
+++ b/media/libaom/src/third_party/libwebm/PATENTS.TXT
diff --git a/third_party/aom/third_party/libwebm/README.libaom b/media/libaom/src/third_party/libwebm/README.libaom
index bd288d201..bd288d201 100644
--- a/third_party/aom/third_party/libwebm/README.libaom
+++ b/media/libaom/src/third_party/libwebm/README.libaom
diff --git a/third_party/aom/third_party/libwebm/common/file_util.cc b/media/libaom/src/third_party/libwebm/common/file_util.cc
index 618ffc087..618ffc087 100644
--- a/third_party/aom/third_party/libwebm/common/file_util.cc
+++ b/media/libaom/src/third_party/libwebm/common/file_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/file_util.h b/media/libaom/src/third_party/libwebm/common/file_util.h
index a87373464..a87373464 100644
--- a/third_party/aom/third_party/libwebm/common/file_util.h
+++ b/media/libaom/src/third_party/libwebm/common/file_util.h
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.cc b/media/libaom/src/third_party/libwebm/common/hdr_util.cc
index 916f7170b..916f7170b 100644
--- a/third_party/aom/third_party/libwebm/common/hdr_util.cc
+++ b/media/libaom/src/third_party/libwebm/common/hdr_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.h b/media/libaom/src/third_party/libwebm/common/hdr_util.h
index 78e2eeb70..78e2eeb70 100644
--- a/third_party/aom/third_party/libwebm/common/hdr_util.h
+++ b/media/libaom/src/third_party/libwebm/common/hdr_util.h
diff --git a/third_party/aom/third_party/libwebm/common/webmids.h b/media/libaom/src/third_party/libwebm/common/webmids.h
index 89d722a71..89d722a71 100644
--- a/third_party/aom/third_party/libwebm/common/webmids.h
+++ b/media/libaom/src/third_party/libwebm/common/webmids.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
index bae2c99b8..bae2c99b8 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
index 9e817bced..9e817bced 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
index e5db12160..e5db12160 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
index 355d4e22b..355d4e22b 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
index 132388da5..132388da5 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
index 84655d802..84655d802 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
index 4227c6374..4227c6374 100644
--- a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h
+++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
index e7b76f7da..e7b76f7da 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc
+++ b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
index 26c2b7e5e..26c2b7e5e 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.h
+++ b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
index 23d68f508..23d68f508 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc
+++ b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
index 9831ecf64..9831ecf64 100644
--- a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.h
+++ b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
diff --git a/third_party/aom/third_party/libyuv/README.libaom b/media/libaom/src/third_party/libyuv/README.libaom
index 09693c1f2..09693c1f2 100644
--- a/third_party/aom/third_party/libyuv/README.libaom
+++ b/media/libaom/src/third_party/libyuv/README.libaom
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/basic_types.h b/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
index 66e68536c..66e68536c 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/basic_types.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/compare.h b/media/libaom/src/third_party/libyuv/include/libyuv/compare.h
index 2a9f1560c..2a9f1560c 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/compare.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/compare.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert.h
index d6f206c10..d6f206c10 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/convert.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
index ea75c0b26..ea75c0b26 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
index 3591b4fd6..3591b4fd6 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert_from.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
index 4a6226813..4a6226813 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h b/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
index 870e94e8c..870e94e8c 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
index fa1e51f9a..fa1e51f9a 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h b/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
index 7fe4d8eed..7fe4d8eed 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
index 8a9673f28..8a9673f28 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
index 2bdc8ec6b..2bdc8ec6b 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
index d0bfbdd2b..d0bfbdd2b 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/row.h b/media/libaom/src/third_party/libyuv/include/libyuv/row.h
index 5c3187ef7..5c3187ef7 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/row.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale.h
index 3974aba34..3974aba34 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/scale.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
index 22563837d..22563837d 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
index a46b5ce69..a46b5ce69 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/scale_row.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/version.h b/media/libaom/src/third_party/libyuv/include/libyuv/version.h
index 287b98ebf..287b98ebf 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/version.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/version.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/video_common.h b/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
index 7b0a19cc9..7b0a19cc9 100644
--- a/third_party/aom/third_party/libyuv/include/libyuv/video_common.h
+++ b/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
diff --git a/third_party/aom/third_party/libyuv/source/compare.cc b/media/libaom/src/third_party/libyuv/source/compare.cc
index 46aa8473d..46aa8473d 100644
--- a/third_party/aom/third_party/libyuv/source/compare.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_common.cc b/media/libaom/src/third_party/libyuv/source/compare_common.cc
index c546b5182..c546b5182 100644
--- a/third_party/aom/third_party/libyuv/source/compare_common.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_gcc.cc b/media/libaom/src/third_party/libyuv/source/compare_gcc.cc
index 247cb33bb..247cb33bb 100644
--- a/third_party/aom/third_party/libyuv/source/compare_gcc.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon.cc b/media/libaom/src/third_party/libyuv/source/compare_neon.cc
index ef006ec41..ef006ec41 100644
--- a/third_party/aom/third_party/libyuv/source/compare_neon.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon64.cc b/media/libaom/src/third_party/libyuv/source/compare_neon64.cc
index 6d1e5e1bc..6d1e5e1bc 100644
--- a/third_party/aom/third_party/libyuv/source/compare_neon64.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_win.cc b/media/libaom/src/third_party/libyuv/source/compare_win.cc
index 19806f275..19806f275 100644
--- a/third_party/aom/third_party/libyuv/source/compare_win.cc
+++ b/media/libaom/src/third_party/libyuv/source/compare_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert.cc b/media/libaom/src/third_party/libyuv/source/convert.cc
index 3ad6bd7a4..3ad6bd7a4 100644
--- a/third_party/aom/third_party/libyuv/source/convert.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_argb.cc
index 44756bc41..44756bc41 100644
--- a/third_party/aom/third_party/libyuv/source/convert_argb.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from.cc b/media/libaom/src/third_party/libyuv/source/convert_from.cc
index 31f1ac992..31f1ac992 100644
--- a/third_party/aom/third_party/libyuv/source/convert_from.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_from.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
index 8d1e97aec..8d1e97aec 100644
--- a/third_party/aom/third_party/libyuv/source/convert_from_argb.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_jpeg.cc b/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
index bcb980f7f..bcb980f7f 100644
--- a/third_party/aom/third_party/libyuv/source/convert_jpeg.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
index af829fbd3..af829fbd3 100644
--- a/third_party/aom/third_party/libyuv/source/convert_to_argb.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_i420.cc b/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
index 5e75369b5..5e75369b5 100644
--- a/third_party/aom/third_party/libyuv/source/convert_to_i420.cc
+++ b/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
diff --git a/third_party/aom/third_party/libyuv/source/cpu_id.cc b/media/libaom/src/third_party/libyuv/source/cpu_id.cc
index 72f686e3b..72f686e3b 100644
--- a/third_party/aom/third_party/libyuv/source/cpu_id.cc
+++ b/media/libaom/src/third_party/libyuv/source/cpu_id.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
index 75f8a610e..75f8a610e 100644
--- a/third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc
+++ b/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_validate.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
index 8edfbe1e7..8edfbe1e7 100644
--- a/third_party/aom/third_party/libyuv/source/mjpeg_validate.cc
+++ b/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
diff --git a/third_party/aom/third_party/libyuv/source/planar_functions.cc b/media/libaom/src/third_party/libyuv/source/planar_functions.cc
index b96bd5020..b96bd5020 100644
--- a/third_party/aom/third_party/libyuv/source/planar_functions.cc
+++ b/media/libaom/src/third_party/libyuv/source/planar_functions.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate.cc b/media/libaom/src/third_party/libyuv/source/rotate.cc
index be3d58920..be3d58920 100644
--- a/third_party/aom/third_party/libyuv/source/rotate.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_any.cc b/media/libaom/src/third_party/libyuv/source/rotate_any.cc
index 4d6eb34e1..4d6eb34e1 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_any.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_argb.cc b/media/libaom/src/third_party/libyuv/source/rotate_argb.cc
index 787c0ad1b..787c0ad1b 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_argb.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_common.cc b/media/libaom/src/third_party/libyuv/source/rotate_common.cc
index b33a9a0c6..b33a9a0c6 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_common.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_gcc.cc b/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
index fd385bcd3..fd385bcd3 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_gcc.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_mips.cc b/media/libaom/src/third_party/libyuv/source/rotate_mips.cc
index efe6bd909..efe6bd909 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_mips.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon.cc
index 76043b3b3..76043b3b3 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_neon.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon64.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
index f52c082b3..f52c082b3 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_neon64.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_win.cc b/media/libaom/src/third_party/libyuv/source/rotate_win.cc
index 2760066df..2760066df 100644
--- a/third_party/aom/third_party/libyuv/source/rotate_win.cc
+++ b/media/libaom/src/third_party/libyuv/source/rotate_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_any.cc b/media/libaom/src/third_party/libyuv/source/row_any.cc
index 1cb1f6b93..1cb1f6b93 100644
--- a/third_party/aom/third_party/libyuv/source/row_any.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_common.cc b/media/libaom/src/third_party/libyuv/source/row_common.cc
index 49875894f..49875894f 100644
--- a/third_party/aom/third_party/libyuv/source/row_common.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_gcc.cc b/media/libaom/src/third_party/libyuv/source/row_gcc.cc
index 820de0a1c..820de0a1c 100644
--- a/third_party/aom/third_party/libyuv/source/row_gcc.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_mips.cc b/media/libaom/src/third_party/libyuv/source/row_mips.cc
index cfc9ffe03..cfc9ffe03 100644
--- a/third_party/aom/third_party/libyuv/source/row_mips.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon.cc b/media/libaom/src/third_party/libyuv/source/row_neon.cc
index 1a72eb903..1a72eb903 100644
--- a/third_party/aom/third_party/libyuv/source/row_neon.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon64.cc b/media/libaom/src/third_party/libyuv/source/row_neon64.cc
index 5d015454b..5d015454b 100644
--- a/third_party/aom/third_party/libyuv/source/row_neon64.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_win.cc b/media/libaom/src/third_party/libyuv/source/row_win.cc
index 71be268b4..71be268b4 100644
--- a/third_party/aom/third_party/libyuv/source/row_win.cc
+++ b/media/libaom/src/third_party/libyuv/source/row_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_x86.asm b/media/libaom/src/third_party/libyuv/source/row_x86.asm
index 0cb326f8e..0cb326f8e 100644
--- a/third_party/aom/third_party/libyuv/source/row_x86.asm
+++ b/media/libaom/src/third_party/libyuv/source/row_x86.asm
diff --git a/third_party/aom/third_party/libyuv/source/scale.cc b/media/libaom/src/third_party/libyuv/source/scale.cc
index 0a01304c4..0a01304c4 100644
--- a/third_party/aom/third_party/libyuv/source/scale.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_any.cc b/media/libaom/src/third_party/libyuv/source/scale_any.cc
index 2f6a2c8ba..2f6a2c8ba 100644
--- a/third_party/aom/third_party/libyuv/source/scale_any.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_argb.cc b/media/libaom/src/third_party/libyuv/source/scale_argb.cc
index 40a2d1ab2..40a2d1ab2 100644
--- a/third_party/aom/third_party/libyuv/source/scale_argb.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_common.cc b/media/libaom/src/third_party/libyuv/source/scale_common.cc
index 1711f3d54..1711f3d54 100644
--- a/third_party/aom/third_party/libyuv/source/scale_common.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_gcc.cc b/media/libaom/src/third_party/libyuv/source/scale_gcc.cc
index 8a6ac5459..8a6ac5459 100644
--- a/third_party/aom/third_party/libyuv/source/scale_gcc.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_mips.cc b/media/libaom/src/third_party/libyuv/source/scale_mips.cc
index 3eb4f27c4..3eb4f27c4 100644
--- a/third_party/aom/third_party/libyuv/source/scale_mips.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon.cc b/media/libaom/src/third_party/libyuv/source/scale_neon.cc
index 7825878e9..7825878e9 100644
--- a/third_party/aom/third_party/libyuv/source/scale_neon.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon64.cc b/media/libaom/src/third_party/libyuv/source/scale_neon64.cc
index 1d5519357..1d5519357 100644
--- a/third_party/aom/third_party/libyuv/source/scale_neon64.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_win.cc b/media/libaom/src/third_party/libyuv/source/scale_win.cc
index c3896ebad..c3896ebad 100644
--- a/third_party/aom/third_party/libyuv/source/scale_win.cc
+++ b/media/libaom/src/third_party/libyuv/source/scale_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/video_common.cc b/media/libaom/src/third_party/libyuv/source/video_common.cc
index 379a0669a..379a0669a 100644
--- a/third_party/aom/third_party/libyuv/source/video_common.cc
+++ b/media/libaom/src/third_party/libyuv/source/video_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/x86inc.asm b/media/libaom/src/third_party/libyuv/source/x86inc.asm
index cb5c32df3..cb5c32df3 100644
--- a/third_party/aom/third_party/libyuv/source/x86inc.asm
+++ b/media/libaom/src/third_party/libyuv/source/x86inc.asm
diff --git a/third_party/aom/third_party/vector/LICENSE b/media/libaom/src/third_party/vector/LICENSE
index afcb9f00a..afcb9f00a 100644
--- a/third_party/aom/third_party/vector/LICENSE
+++ b/media/libaom/src/third_party/vector/LICENSE
diff --git a/third_party/aom/third_party/vector/README.libaom b/media/libaom/src/third_party/vector/README.libaom
index 2bb8b2d5d..2bb8b2d5d 100644
--- a/third_party/aom/third_party/vector/README.libaom
+++ b/media/libaom/src/third_party/vector/README.libaom
diff --git a/third_party/aom/third_party/vector/vector.c b/media/libaom/src/third_party/vector/vector.c
index fe46246a1..fe46246a1 100644
--- a/third_party/aom/third_party/vector/vector.c
+++ b/media/libaom/src/third_party/vector/vector.c
diff --git a/third_party/aom/third_party/vector/vector.h b/media/libaom/src/third_party/vector/vector.h
index 02743f5f1..02743f5f1 100644
--- a/third_party/aom/third_party/vector/vector.h
+++ b/media/libaom/src/third_party/vector/vector.h
diff --git a/third_party/aom/third_party/x86inc/LICENSE b/media/libaom/src/third_party/x86inc/LICENSE
index 7d07645a1..7d07645a1 100644
--- a/third_party/aom/third_party/x86inc/LICENSE
+++ b/media/libaom/src/third_party/x86inc/LICENSE
diff --git a/third_party/aom/third_party/x86inc/README.libaom b/media/libaom/src/third_party/x86inc/README.libaom
index 07c4dad20..07c4dad20 100644
--- a/third_party/aom/third_party/x86inc/README.libaom
+++ b/media/libaom/src/third_party/x86inc/README.libaom
diff --git a/third_party/aom/third_party/x86inc/x86inc.asm b/media/libaom/src/third_party/x86inc/x86inc.asm
index adaf2d99e..adaf2d99e 100644
--- a/third_party/aom/third_party/x86inc/x86inc.asm
+++ b/media/libaom/src/third_party/x86inc/x86inc.asm
diff --git a/third_party/aom/tools/aggregate_entropy_stats.py b/media/libaom/src/tools/aggregate_entropy_stats.py
index 7cb4d18e1..7cb4d18e1 100644
--- a/third_party/aom/tools/aggregate_entropy_stats.py
+++ b/media/libaom/src/tools/aggregate_entropy_stats.py
diff --git a/third_party/aom/tools/aom_entropy_optimizer.c b/media/libaom/src/tools/aom_entropy_optimizer.c
index 551adf4f2..551adf4f2 100644
--- a/third_party/aom/tools/aom_entropy_optimizer.c
+++ b/media/libaom/src/tools/aom_entropy_optimizer.c
diff --git a/third_party/aom/tools/cpplint.py b/media/libaom/src/tools/cpplint.py
index 25fbef73d..25fbef73d 100755..100644
--- a/third_party/aom/tools/cpplint.py
+++ b/media/libaom/src/tools/cpplint.py
diff --git a/third_party/aom/tools/diff.py b/media/libaom/src/tools/diff.py
index bac6aabdc..bac6aabdc 100644
--- a/third_party/aom/tools/diff.py
+++ b/media/libaom/src/tools/diff.py
diff --git a/third_party/aom/tools/dump_obu.cc b/media/libaom/src/tools/dump_obu.cc
index 30ee5e7a1..30ee5e7a1 100644
--- a/third_party/aom/tools/dump_obu.cc
+++ b/media/libaom/src/tools/dump_obu.cc
diff --git a/third_party/aom/tools/gen_authors.sh b/media/libaom/src/tools/gen_authors.sh
index 5def8bc89..5def8bc89 100755..100644
--- a/third_party/aom/tools/gen_authors.sh
+++ b/media/libaom/src/tools/gen_authors.sh
diff --git a/third_party/aom/tools/gen_constrained_tokenset.py b/media/libaom/src/tools/gen_constrained_tokenset.py
index 5d12ee1ef..5d12ee1ef 100755..100644
--- a/third_party/aom/tools/gen_constrained_tokenset.py
+++ b/media/libaom/src/tools/gen_constrained_tokenset.py
diff --git a/third_party/aom/tools/inspect-cli.js b/media/libaom/src/tools/inspect-cli.js
index a14c08111..a14c08111 100644
--- a/third_party/aom/tools/inspect-cli.js
+++ b/media/libaom/src/tools/inspect-cli.js
diff --git a/third_party/aom/tools/inspect-post.js b/media/libaom/src/tools/inspect-post.js
index 31c40bb82..31c40bb82 100644
--- a/third_party/aom/tools/inspect-post.js
+++ b/media/libaom/src/tools/inspect-post.js
diff --git a/third_party/aom/tools/intersect-diffs.py b/media/libaom/src/tools/intersect-diffs.py
index df13c4ef7..df13c4ef7 100755..100644
--- a/third_party/aom/tools/intersect-diffs.py
+++ b/media/libaom/src/tools/intersect-diffs.py
diff --git a/third_party/aom/tools/lint-hunks.py b/media/libaom/src/tools/lint-hunks.py
index d02bee16c..d02bee16c 100755..100644
--- a/third_party/aom/tools/lint-hunks.py
+++ b/media/libaom/src/tools/lint-hunks.py
diff --git a/third_party/aom/tools/obu_parser.cc b/media/libaom/src/tools/obu_parser.cc
index 7d71386ce..7d71386ce 100644
--- a/third_party/aom/tools/obu_parser.cc
+++ b/media/libaom/src/tools/obu_parser.cc
diff --git a/third_party/aom/tools/obu_parser.h b/media/libaom/src/tools/obu_parser.h
index 1d7d2d794..1d7d2d794 100644
--- a/third_party/aom/tools/obu_parser.h
+++ b/media/libaom/src/tools/obu_parser.h
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc b/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
index 7c5400b91..7c5400b91 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc
+++ b/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.cc b/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
index a24906100..a24906100 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_graph.cc
+++ b/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.h b/media/libaom/src/tools/txfm_analyzer/txfm_graph.h
index 2e3c9551e..2e3c9551e 100644
--- a/third_party/aom/tools/txfm_analyzer/txfm_graph.h
+++ b/media/libaom/src/tools/txfm_analyzer/txfm_graph.h
diff --git a/third_party/aom/tools/wrap-commit-msg.py b/media/libaom/src/tools/wrap-commit-msg.py
index 1c7882443..1c7882443 100755..100644
--- a/third_party/aom/tools/wrap-commit-msg.py
+++ b/media/libaom/src/tools/wrap-commit-msg.py
diff --git a/third_party/aom/usage.dox b/media/libaom/src/usage.dox
index 062d35a83..062d35a83 100644
--- a/third_party/aom/usage.dox
+++ b/media/libaom/src/usage.dox
diff --git a/third_party/aom/usage_cx.dox b/media/libaom/src/usage_cx.dox
index 51b4e8e3e..51b4e8e3e 100644
--- a/third_party/aom/usage_cx.dox
+++ b/media/libaom/src/usage_cx.dox
diff --git a/third_party/aom/usage_dx.dox b/media/libaom/src/usage_dx.dox
index eef78376f..eef78376f 100644
--- a/third_party/aom/usage_dx.dox
+++ b/media/libaom/src/usage_dx.dox