diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-04-01 21:12:56 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-01 21:12:56 -0700 |
| commit | 49bc402a9479636d6b75693e421473161de98db4 (patch) | |
| tree | 571dddccab1bcbcaa7a29ccef88897c05ab838dd /vp9/encoder | |
| parent | a417a6e32ccac75c406afa11ab95d1a4a2ec7266 (diff) | |
| parent | 50e54c112d4541bb7b78a355c8a1944891e44957 (diff) | |
| download | libvpx-49bc402a9479636d6b75693e421473161de98db4.tar libvpx-49bc402a9479636d6b75693e421473161de98db4.tar.gz libvpx-49bc402a9479636d6b75693e421473161de98db4.tar.bz2 libvpx-49bc402a9479636d6b75693e421473161de98db4.zip | |
Merge "Code cleanup." into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 912db5edb..67bd64a61 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -326,7 +326,7 @@ static void dealloc_compressor_data(VP9_COMP *cpi) { vpx_free(cpi->active_map); cpi->active_map = 0; - vp9_de_alloc_frame_buffers(&cpi->common); + vp9_free_frame_buffers(&cpi->common); vp8_yv12_de_alloc_frame_buffer(&cpi->last_frame_uf); vp8_yv12_de_alloc_frame_buffer(&cpi->scaled_source); @@ -960,9 +960,8 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) { static void update_frame_size(VP9_COMP *cpi) { VP9_COMMON *cm = &cpi->common; - /* our internal buffers are always multiples of 16 */ - int aligned_width = (cm->width + 15) & ~15; - int aligned_height = (cm->height + 15) & ~15; + const int aligned_width = multiple16(cm->width); + const int aligned_height = multiple16(cm->height); cm->mb_rows = aligned_height >> 4; cm->mb_cols = aligned_width >> 4; |