[xiph-commits] r17646 - trunk/theora/lib/arm

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-11-24 13:11:47 -0800 (Wed, 24 Nov 2010)
New Revision: 17646

Modified:
   trunk/theora/lib/arm/armcpu.c
Log:
Fix out-of-date OC_ARM_ASM_ARMV6 usage.

This was ultimately named OC_ARM_ASM_MEDIA instead.
It shouldn't have mattered in this case, as it shouldn't be possible to get
 OC_ARM_ASM_MEDIA without OC_ARM_ASM_EDSP, but clean it up anyway.


Modified: trunk/theora/lib/arm/armcpu.c
===================================================================
--- trunk/theora/lib/arm/armcpu.c	2010-11-24 20:51:36 UTC (rev 17645)
+++ trunk/theora/lib/arm/armcpu.c	2010-11-24 21:11:47 UTC (rev 17646)
@@ -20,7 +20,7 @@
 #include "armcpu.h"
 
 #if !defined(OC_ARM_ASM)|| \
- !defined(OC_ARM_ASM_EDSP)&&!defined(OC_ARM_ASM_ARMV6)&& \
+ !defined(OC_ARM_ASM_EDSP)&&!defined(OC_ARM_ASM_MEDIA)&& \
  !defined(OC_ARM_ASM_NEON)
 ogg_uint32_t oc_cpu_flags_get(void){
   return 0;