Index: source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h |
=================================================================== |
--- source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h (revision 219822) |
+++ source/config/linux/arm-neon-cpu-detect/vpx_scale_rtcd.h (working copy) |
@@ -34,13 +34,13 @@ |
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); |
-void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-void vp8_yv12_copy_frame_neon(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-RTCD_EXTERN void (*vp8_yv12_copy_frame)(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
+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); |
-void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-void vp8_yv12_copy_y_neon(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
-RTCD_EXTERN void (*vp8_yv12_copy_y)(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
+void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
+void vpx_yv12_copy_y_neon(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
+RTCD_EXTERN void (*vpx_yv12_copy_y)(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); |
void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y); |
#define vp9_extend_frame_borders vp9_extend_frame_borders_c |
@@ -72,8 +72,8 @@ |
vp8_yv12_copy_frame = vp8_yv12_copy_frame_c; |
if (flags & HAS_NEON) vp8_yv12_copy_frame = vp8_yv12_copy_frame_neon; |
- vp8_yv12_copy_y = vp8_yv12_copy_y_c; |
- if (flags & HAS_NEON) vp8_yv12_copy_y = vp8_yv12_copy_y_neon; |
+ vpx_yv12_copy_y = vpx_yv12_copy_y_c; |
+ if (flags & HAS_NEON) vpx_yv12_copy_y = vpx_yv12_copy_y_neon; |
} |
#endif |
#endif |