Index: source/libvpx/vp8/common/asm_com_offsets.c |
=================================================================== |
--- source/libvpx/vp8/common/asm_com_offsets.c (revision 172621) |
+++ source/libvpx/vp8/common/asm_com_offsets.c (working copy) |
@@ -12,7 +12,6 @@ |
#include "vpx_config.h" |
#include "vpx/vpx_codec.h" |
#include "vpx_ports/asm_offsets.h" |
-#include "vpx_scale/yv12config.h" |
#include "vp8/common/blockd.h" |
#if CONFIG_POSTPROC |
@@ -21,19 +20,6 @@ |
BEGIN |
-/* vpx_scale */ |
-DEFINE(yv12_buffer_config_y_width, offsetof(YV12_BUFFER_CONFIG, y_width)); |
-DEFINE(yv12_buffer_config_y_height, offsetof(YV12_BUFFER_CONFIG, y_height)); |
-DEFINE(yv12_buffer_config_y_stride, offsetof(YV12_BUFFER_CONFIG, y_stride)); |
-DEFINE(yv12_buffer_config_uv_width, offsetof(YV12_BUFFER_CONFIG, uv_width)); |
-DEFINE(yv12_buffer_config_uv_height, offsetof(YV12_BUFFER_CONFIG, uv_height)); |
-DEFINE(yv12_buffer_config_uv_stride, offsetof(YV12_BUFFER_CONFIG, uv_stride)); |
-DEFINE(yv12_buffer_config_y_buffer, offsetof(YV12_BUFFER_CONFIG, y_buffer)); |
-DEFINE(yv12_buffer_config_u_buffer, offsetof(YV12_BUFFER_CONFIG, u_buffer)); |
-DEFINE(yv12_buffer_config_v_buffer, offsetof(YV12_BUFFER_CONFIG, v_buffer)); |
-DEFINE(yv12_buffer_config_border, offsetof(YV12_BUFFER_CONFIG, border)); |
-DEFINE(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS); |
- |
#if CONFIG_POSTPROC |
/* mfqe.c / filter_by_weight */ |
DEFINE(MFQE_PRECISION_VAL, MFQE_PRECISION); |
@@ -58,11 +44,6 @@ |
ct_assert(B_HU_PRED, B_HU_PRED == 9); |
#endif |
-#if HAVE_NEON |
-/* vp8_yv12_extend_frame_borders_neon makes several assumptions based on this */ |
-ct_assert(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS == 32) |
-#endif |
- |
#if HAVE_SSE2 |
#if CONFIG_POSTPROC |
/* vp8_filter_by_weight16x16 and 8x8 */ |