summaryrefslogtreecommitdiffstats
path: root/third_party/aom/aom_ports/arm_cpudetect.c
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-19 23:05:00 -0500
committertrav90 <travawine@palemoon.org>2018-10-19 23:05:03 -0500
commitd2499ead93dc4298c0882fe98902acb1b5209f99 (patch)
treecb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/aom_ports/arm_cpudetect.c
parent41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff)
downloadUXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar
UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz
UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz
UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz
UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/aom_ports/arm_cpudetect.c')
-rw-r--r--third_party/aom/aom_ports/arm_cpudetect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/aom/aom_ports/arm_cpudetect.c b/third_party/aom/aom_ports/arm_cpudetect.c
index 70efee996..5a75bb348 100644
--- a/third_party/aom/aom_ports/arm_cpudetect.c
+++ b/third_party/aom/aom_ports/arm_cpudetect.c
@@ -40,7 +40,7 @@ static int arm_cpu_env_mask(void) {
#if !CONFIG_RUNTIME_CPU_DETECT
-int arm_cpu_caps(void) {
+int aom_arm_cpu_caps(void) {
/* This function should actually be a no-op. There is no way to adjust any of
* these because the RTCD tables do not exist: the functions are called
* statically */
@@ -62,7 +62,7 @@ int arm_cpu_caps(void) {
#define WIN32_EXTRA_LEAN
#include <windows.h>
-int arm_cpu_caps(void) {
+int aom_arm_cpu_caps(void) {
int flags;
int mask;
if (!arm_cpu_env_flags(&flags)) {
@@ -90,7 +90,7 @@ int arm_cpu_caps(void) {
#elif defined(__ANDROID__) /* end _MSC_VER */
#include <cpu-features.h>
-int arm_cpu_caps(void) {
+int aom_arm_cpu_caps(void) {
int flags;
int mask;
uint64_t features;
@@ -110,7 +110,7 @@ int arm_cpu_caps(void) {
#include <stdio.h>
-int arm_cpu_caps(void) {
+int aom_arm_cpu_caps(void) {
FILE *fin;
int flags;
int mask;