Merge branch 'libaom_update' into development

scripts/libaom/android.cmake

@@ -10,8 +10,8 @@ include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
 
 # AS_EXECUTABLE (AV1 Codec Library's variable) should point to an assembler
 # For x86 and x86_64 ABIs it needs yasm
-# For armeabi-v7a and arm64-v8a is is ok to use GNU assembler
+# For armeabi-v7a and arm64-v8a it is ok to use GNU assembler
-# When ANDROID_ABI is x86 or _86_64,
+# When ANDROID_ABI is x86 or x86_64,
 # then CMAKE_ASM_NASM_COMPILER variable will point to the yasm compiler (it is set by android.toolchain.cmake)
 if(DEFINED CMAKE_ASM_NASM_COMPILER)
   set(AS_EXECUTABLE ${CMAKE_ASM_NASM_COMPILER})

scripts/libaom/download.sh

@@ -6,8 +6,8 @@
 
 # This 2 variables have to be changed at once.
 # The first one is produced by 'git describe' command while being in the commit represented by the second one.
-AOM_VERSION=v1.0.0-2780-ge1ec46ae2
+AOM_VERSION=v1.0.0-errata1-avif
-AOM_HASH=e1ec46ae24bb406057c3c256e69cd359b342a8d3
+AOM_HASH=4eb1e7795b9700d532af38a2d9489458a8038233
 
 echo "Using libaom $AOM_VERSION"
 AOM_SOURCES=libaom-${AOM_VERSION}