| Index: source/libvpx/vp8/common/arm/loopfilter_arm.h | 
| =================================================================== | 
| --- source/libvpx/vp8/common/arm/loopfilter_arm.h	(revision 96967) | 
| +++ source/libvpx/vp8/common/arm/loopfilter_arm.h	(working copy) | 
| @@ -12,15 +12,17 @@ | 
| #ifndef LOOPFILTER_ARM_H | 
| #define LOOPFILTER_ARM_H | 
|  | 
| +#include "vpx_config.h" | 
| + | 
| #if HAVE_ARMV6 | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbv_armv6); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bv_armv6); | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbh_armv6); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bh_armv6); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbvs_armv6); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bvs_armv6); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbhs_armv6); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bhs_armv6); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bvs_armv6); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bhs_armv6); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_horizontal_edge_armv6); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_armv6); | 
|  | 
| #if !CONFIG_RUNTIME_CPU_DETECT | 
| #undef  vp8_lf_normal_mb_v | 
| @@ -36,28 +38,29 @@ | 
| #define vp8_lf_normal_b_h vp8_loop_filter_bh_armv6 | 
|  | 
| #undef  vp8_lf_simple_mb_v | 
| -#define vp8_lf_simple_mb_v vp8_loop_filter_mbvs_armv6 | 
| +#define vp8_lf_simple_mb_v vp8_loop_filter_simple_vertical_edge_armv6 | 
|  | 
| #undef  vp8_lf_simple_b_v | 
| #define vp8_lf_simple_b_v vp8_loop_filter_bvs_armv6 | 
|  | 
| #undef  vp8_lf_simple_mb_h | 
| -#define vp8_lf_simple_mb_h vp8_loop_filter_mbhs_armv6 | 
| +#define vp8_lf_simple_mb_h vp8_loop_filter_simple_horizontal_edge_armv6 | 
|  | 
| #undef  vp8_lf_simple_b_h | 
| #define vp8_lf_simple_b_h vp8_loop_filter_bhs_armv6 | 
| -#endif | 
| -#endif | 
| +#endif /* !CONFIG_RUNTIME_CPU_DETECT */ | 
|  | 
| +#endif /* HAVE_ARMV6 */ | 
| + | 
| #if HAVE_ARMV7 | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbv_neon); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bv_neon); | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbh_neon); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bh_neon); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbvs_neon); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bvs_neon); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbhs_neon); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bhs_neon); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_mbvs_neon); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bvs_neon); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_mbhs_neon); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bhs_neon); | 
|  | 
| #if !CONFIG_RUNTIME_CPU_DETECT | 
| #undef  vp8_lf_normal_mb_v | 
| @@ -83,7 +86,8 @@ | 
|  | 
| #undef  vp8_lf_simple_b_h | 
| #define vp8_lf_simple_b_h vp8_loop_filter_bhs_neon | 
| -#endif | 
| -#endif | 
| +#endif /* !CONFIG_RUNTIME_CPU_DETECT */ | 
|  | 
| -#endif | 
| +#endif /* HAVE_ARMV7 */ | 
| + | 
| +#endif /* LOOPFILTER_ARM_H */ | 
|  |