diff options
| author | James Zern <jzern@google.com> | 2013-02-22 16:06:48 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2013-02-22 16:25:13 -0800 |
| commit | e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7 (patch) | |
| tree | 67be754f3382f5f5f79f50f3912d22883ead6ef7 | |
| parent | 50771d41f2df6c16dfde17286971d416b4c4f3bf (diff) | |
| download | libvpx-e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7.tar libvpx-e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7.tar.gz libvpx-e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7.tar.bz2 libvpx-e5fb6321a12c02035eb0453c9aa0a5721fd5e7f7.zip | |
give vp9 variance struct a unique name
variance_vtable clashed with vp8/common/variance.h
Change-Id: I09c1de44d5519f1bd13f58c01144c0de4706de6f
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_variance.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 39af2080a..ddca11931 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -14,7 +14,7 @@ struct loop_filter_info; /* Encoder forward decls */ struct block; struct macroblock; -struct variance_vtable; +struct vp9_variance_vtable; #define DEC_MVCOSTS int *mvjcost, int *mvcost[2] union int_mv; @@ -722,16 +722,16 @@ specialize vp9_short_walsh8x4_x8 # # Motion search # -prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" specialize vp9_full_search_sad sse3 sse4_1 vp9_full_search_sad_sse3=vp9_full_search_sadx3 vp9_full_search_sad_sse4_1=vp9_full_search_sadx8 -prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" specialize vp9_refining_search_sad sse3 vp9_refining_search_sad_sse3=vp9_refining_search_sadx4 -prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" specialize vp9_diamond_search_sad sse3 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4 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; |