From e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Feb 2013 16:06:48 -0800 Subject: give vp9 variance struct a unique name variance_vtable clashed with vp8/common/variance.h Change-Id: I09c1de44d5519f1bd13f58c01144c0de4706de6f --- vp9/encoder/vp9_variance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_variance.h b/vp9/encoder/vp9_variance.h index 3f0af0855..675dbb63e 100644 --- a/vp9/encoder/vp9_variance.h +++ b/vp9/encoder/vp9_variance.h @@ -69,7 +69,7 @@ typedef unsigned int (*vp9_get16x16prederror_fn_t)(const uint8_t *src_ptr, const uint8_t *ref_ptr, int ref_stride); -typedef struct variance_vtable { +typedef struct vp9_variance_vtable { vp9_sad_fn_t sdf; vp9_variance_fn_t vf; vp9_subpixvariance_fn_t svf; -- cgit v1.2.3