Index: source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h |
=================================================================== |
--- source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h (revision 290053) |
+++ source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h (working copy) |
@@ -35,12 +35,10 @@ |
#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c |
void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-void vp8_yv12_copy_frame_neon(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-RTCD_EXTERN void (*vp8_yv12_copy_frame)(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
+#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c |
void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); |
-void vp8_yv12_extend_frame_borders_neon(struct yv12_buffer_config *ybf); |
-RTCD_EXTERN void (*vp8_yv12_extend_frame_borders)(struct yv12_buffer_config *ybf); |
+#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c |
void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf); |
#define vp9_extend_frame_borders vp9_extend_frame_borders_c |
@@ -63,10 +61,6 @@ |
(void)flags; |
- vp8_yv12_copy_frame = vp8_yv12_copy_frame_c; |
- if (flags & HAS_NEON) vp8_yv12_copy_frame = vp8_yv12_copy_frame_neon; |
- vp8_yv12_extend_frame_borders = vp8_yv12_extend_frame_borders_c; |
- if (flags & HAS_NEON) vp8_yv12_extend_frame_borders = vp8_yv12_extend_frame_borders_neon; |
} |
#endif |