diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-17 00:05:13 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-17 00:05:13 -0500 |
| commit | 129311689577edc570ee89049ce4f4867a87df24 (patch) | |
| tree | b461ed05559f8bdf58ad111e053c349934ba2e9e /vp8/encoder/onyx_if.c | |
| parent | 9e95a1a0cd3bfe435463c3ba3798ec093215b7e9 (diff) | |
| parent | da9402fbf6ffb5d0ea5cb7f07598a81c6fedd7a1 (diff) | |
| download | libvpx-129311689577edc570ee89049ce4f4867a87df24.tar libvpx-129311689577edc570ee89049ce4f4867a87df24.tar.gz libvpx-129311689577edc570ee89049ce4f4867a87df24.tar.bz2 libvpx-129311689577edc570ee89049ce4f4867a87df24.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I3efb725e4da4e7c75b2512b80db6af51dec51f79
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 9dc840e3a..86d4232cb 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1336,6 +1336,8 @@ void vp8_set_speed_features(VP8_COMP *cpi) static void alloc_raw_frame_buffers(VP8_COMP *cpi) { int i, buffers; + /* allocate source_buffer to be multiples of 16 */ + int width = (cpi->oxcf.Width + 15) & ~15; buffers = cpi->oxcf.lag_in_frames; @@ -1347,7 +1349,7 @@ static void alloc_raw_frame_buffers(VP8_COMP *cpi) for (i = 0; i < buffers; i++) if (vp8_yv12_alloc_frame_buffer(&cpi->src_buffer[i].source_buffer, - cpi->oxcf.Width, cpi->oxcf.Height, + width, cpi->oxcf.Height, 16)) vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, "Failed to allocate lag buffer"); @@ -1355,7 +1357,7 @@ static void alloc_raw_frame_buffers(VP8_COMP *cpi) #if VP8_TEMPORAL_ALT_REF if (vp8_yv12_alloc_frame_buffer(&cpi->alt_ref_buffer.source_buffer, - cpi->oxcf.Width, cpi->oxcf.Height, 16)) + width, cpi->oxcf.Height, 16)) vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, "Failed to allocate altref buffer"); |