Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / config / linux / arm-neon-cpu-detect / vpx_scale_rtcd.h

diff --git a/src/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h b/src/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h
index 33bed21..f954dbd 100644 (file)
--- a/src/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h
+++ b/src/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h
@@ -7,12 +7,12 @@
 #define RTCD_EXTERN extern
 #endif
 
+struct yv12_buffer_config;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct yv12_buffer_config;
-
 void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 #define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
 
@@ -35,12 +35,10 @@ void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch
 #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 @@ static void setup_rtcd_internal(void)
 
     (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