From 6bd81f49620d919c732e0f8f2ace3bfaed078a9a Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Thu, 10 May 2012 18:13:35 +0000 Subject: [PATCH] Temporarily disable cpu detection in libvpx CPU_DETECTION doesn't work in current build yet, it caused building errors with neon build, disable it for now. Will discuss the future plan with the team. TBR=stefan BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/570006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2218 4adac7df-926f-26a2-2b94-8c16560cd09d --- third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm | 2 +- third_party/libvpx/source/config/linux/arm-neon/vpx_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm index ea83b9b4be..5c724d8af9 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm @@ -46,7 +46,7 @@ .equ CONFIG_MD5 , 1 .equ CONFIG_DEQUANT_TOKENS , 0 .equ CONFIG_DC_RECON , 0 -.equ CONFIG_RUNTIME_CPU_DETECT , 1 +.equ CONFIG_RUNTIME_CPU_DETECT , 0 .equ CONFIG_POSTPROC , 1 .equ CONFIG_MULTITHREAD , 1 .equ CONFIG_INTERNAL_STATS , 0 diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h index 127029d68e..ebf7531470 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h @@ -54,7 +54,7 @@ #define CONFIG_MD5 1 #define CONFIG_DEQUANT_TOKENS 0 #define CONFIG_DC_RECON 0 -#define CONFIG_RUNTIME_CPU_DETECT 1 +#define CONFIG_RUNTIME_CPU_DETECT 0 #define CONFIG_POSTPROC 1 #define CONFIG_MULTITHREAD 1 #define CONFIG_INTERNAL_STATS 0