summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_blockd.h
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-05-30 15:47:59 -0700
committerDmitry Kovalev <dkovalev@google.com>2013-05-31 12:32:53 -0700
commitd771bba27e2a2835594d337a61c04b3c131deee5 (patch)
tree9a8df1a035f453e59c99e35cc28d423defa19362 /vp9/common/vp9_blockd.h
parentd404e820d44a10e3546929effdf7971395ffc6a3 (diff)
downloadlibvpx-d771bba27e2a2835594d337a61c04b3c131deee5.tar
libvpx-d771bba27e2a2835594d337a61c04b3c131deee5.tar.gz
libvpx-d771bba27e2a2835594d337a61c04b3c131deee5.tar.bz2
libvpx-d771bba27e2a2835594d337a61c04b3c131deee5.zip
Renaming 'motion_vector' to 'mv' for consistency.
Change-Id: Ie869ea4992e26867caec46cb878fc86a646aeb9f
Diffstat (limited to 'vp9/common/vp9_blockd.h')
-rw-r--r--vp9/common/vp9_blockd.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index ea330acc4..05ffbef7d 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -243,12 +243,9 @@ struct scale_factors {
int (*scale_value_x)(int val, const struct scale_factors *scale);
int (*scale_value_y)(int val, const struct scale_factors *scale);
void (*set_scaled_offsets)(struct scale_factors *scale, int row, int col);
- int_mv32 (*scale_motion_vector_q3_to_q4)(const int_mv *src_mv,
- const struct scale_factors *scale);
- int32_t (*scale_motion_vector_component_q4)(int mv_q4,
- int num,
- int den,
- int offset_q4);
+ int_mv32 (*scale_mv_q3_to_q4)(const int_mv *src_mv,
+ const struct scale_factors *scale);
+ int32_t (*scale_mv_component_q4)(int mv_q4, int num, int den, int offset_q4);
convolve_fn_t predict[2][2][2]; // horiz, vert, avg
};