diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
| commit | 5f6db3591c64b9d53a5cf76f3afc5c28027d0feb (patch) | |
| tree | d1507d4bff9f2308c8d42606c5345d435e9a6e24 /vp8/common/alloccommon.c | |
| parent | 4a1c3cf7d8bb38db15702f6fb772c9b94233c8e9 (diff) | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b (diff) | |
| download | libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.gz libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.bz2 libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06
Diffstat (limited to 'vp8/common/alloccommon.c')
| -rw-r--r-- | vp8/common/alloccommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index 3d2f753d9..2dee21191 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -20,7 +20,7 @@ extern void vp8_init_scan_order_mask(); -void vp8_update_mode_info_border(MODE_INFO *mi, int rows, int cols) +static void update_mode_info_border(MODE_INFO *mi, int rows, int cols) { int i; vpx_memset(mi - cols - 2, 0, sizeof(MODE_INFO) * (cols + 1)); @@ -119,7 +119,7 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) return 1; } - vp8_update_mode_info_border(oci->mi, oci->mb_rows, oci->mb_cols); + update_mode_info_border(oci->mi, oci->mb_rows, oci->mb_cols); return 0; } |