summaryrefslogtreecommitdiff
path: root/vp9/decoder/vp9_decodeframe.c
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-03-24 17:19:48 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-03-24 17:19:48 -0700
commitebb4a26202dec4b673ecbfe517b7132ba336be29 (patch)
tree61f3782c3e61cb6ccdc57dbd1207bdeecc80a080 /vp9/decoder/vp9_decodeframe.c
parent0e84fb08e9a157ffcccef188ba1326945b7dd67f (diff)
parentbc2761d3cb0ae78504dcd2ad7ceead3fd55018c5 (diff)
downloadlibvpx-ebb4a26202dec4b673ecbfe517b7132ba336be29.tar
libvpx-ebb4a26202dec4b673ecbfe517b7132ba336be29.tar.gz
libvpx-ebb4a26202dec4b673ecbfe517b7132ba336be29.tar.bz2
libvpx-ebb4a26202dec4b673ecbfe517b7132ba336be29.zip
Merge "Align threading LFWorkerData to 32 bytes."
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
-rw-r--r--vp9/decoder/vp9_decodeframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index bb5a5a22d..44d1e2883 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1338,7 +1338,8 @@ int vp9_decode_frame(VP9D_COMP *pbi,
pbi->do_loopfilter_inline =
(cm->log2_tile_rows | cm->log2_tile_cols) == 0 && cm->lf.filter_level;
if (pbi->do_loopfilter_inline && pbi->lf_worker.data1 == NULL) {
- CHECK_MEM_ERROR(cm, pbi->lf_worker.data1, vpx_malloc(sizeof(LFWorkerData)));
+ CHECK_MEM_ERROR(cm, pbi->lf_worker.data1,
+ vpx_memalign(32, sizeof(LFWorkerData)));
pbi->lf_worker.hook = (VP9WorkerHook)vp9_loop_filter_worker;
if (pbi->oxcf.max_threads > 1 && !vp9_worker_reset(&pbi->lf_worker)) {
vpx_internal_error(&cm->error, VPX_CODEC_ERROR,