[av1] Fix build issues

This revision of libaom has some conflicts with our vendor script
and build system. A number of new .asm files have the same basename
as .c files, which our build system cannot handle.

To work around this, I manually renamed the conflicting
files in the filesystem and sources.mozbuild.

Also add av1_convolve_scale_sse4.c to sources.mozbuild manually.
This is needed by the build but for some reason isn't picked up
by generate_sources_mozbuild.sh.

14 files changed, 0 insertions, 0 deletions

diff --git a/third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm b/third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm.asm
index d01c4bc03e..d01c4bc03e 100644
--- a/third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm b/third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm
index 4a8f8f183a..4a8f8f183a 100644
--- a/third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm b/third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm
index b04df2d0b8..b04df2d0b8 100644
--- a/third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm b/third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm
index e7793fb16e..e7793fb16e 100644
--- a/third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm b/third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm
index 6bd733d5dd..6bd733d5dd 100644
--- a/third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm b/third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm
index 127acf6140..127acf6140 100644
--- a/third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm b/third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm
index ec07e2053b..ec07e2053b 100644
--- a/third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm b/third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm
index f3d5f246d0..f3d5f246d0 100644
--- a/third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm
+++ b/third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_16_neon.asm b/third_party/aom/aom_dsp/arm/loopfilter_16_neon_asm.asm
index b6e2c9edb4..b6e2c9edb4 100644
--- a/third_party/aom/aom_dsp/arm/loopfilter_16_neon.asm
+++ b/third_party/aom/aom_dsp/arm/loopfilter_16_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_4_neon.asm b/third_party/aom/aom_dsp/arm/loopfilter_4_neon_asm.asm
index 8b54984d56..8b54984d56 100644
--- a/third_party/aom/aom_dsp/arm/loopfilter_4_neon.asm
+++ b/third_party/aom/aom_dsp/arm/loopfilter_4_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_8_neon.asm b/third_party/aom/aom_dsp/arm/loopfilter_8_neon_asm.asm
index 9f3db66ee0..9f3db66ee0 100644
--- a/third_party/aom/aom_dsp/arm/loopfilter_8_neon.asm
+++ b/third_party/aom/aom_dsp/arm/loopfilter_8_neon_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm b/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
index 91b3d126ca..91b3d126ca 100644
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm
+++ b/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2.asm b/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
index 9aece27beb..9aece27beb 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_sse2.asm
+++ b/third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm
diff --git a/third_party/aom/aom_dsp/x86/intrapred_ssse3.asm b/third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm
index bc1bb2ff3d..bc1bb2ff3d 100644
--- a/third_party/aom/aom_dsp/x86/intrapred_ssse3.asm
+++ b/third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm