| Index: source/libvpx/vp8/decoder/arm/arm_dsystemdependent.c
|
| ===================================================================
|
| --- source/libvpx/vp8/decoder/arm/arm_dsystemdependent.c (revision 96967)
|
| +++ source/libvpx/vp8/decoder/arm/arm_dsystemdependent.c (working copy)
|
| @@ -13,7 +13,6 @@
|
| #include "vpx_ports/arm.h"
|
| #include "vp8/common/blockd.h"
|
| #include "vp8/common/pragmas.h"
|
| -#include "vp8/common/postproc.h"
|
| #include "vp8/decoder/dequantize.h"
|
| #include "vp8/decoder/onyxd_int.h"
|
|
|
| @@ -21,12 +20,15 @@
|
| {
|
| #if CONFIG_RUNTIME_CPU_DETECT
|
| int flags = pbi->common.rtcd.flags;
|
| - int has_edsp = flags & HAS_EDSP;
|
| - int has_media = flags & HAS_MEDIA;
|
| - int has_neon = flags & HAS_NEON;
|
|
|
| +#if HAVE_ARMV5TE
|
| + if (flags & HAS_EDSP)
|
| + {
|
| + }
|
| +#endif
|
| +
|
| #if HAVE_ARMV6
|
| - if (has_media)
|
| + if (flags & HAS_MEDIA)
|
| {
|
| pbi->dequant.block = vp8_dequantize_b_v6;
|
| pbi->dequant.idct_add = vp8_dequant_idct_add_v6;
|
| @@ -38,7 +40,7 @@
|
| #endif
|
|
|
| #if HAVE_ARMV7
|
| - if (has_neon)
|
| + if (flags & HAS_NEON)
|
| {
|
| pbi->dequant.block = vp8_dequantize_b_neon;
|
| pbi->dequant.idct_add = vp8_dequant_idct_add_neon;
|
|
|