ref: af631e1f1959cf4961e1abeb7f547d6a9114fbcd
parent: 30bd74cf74eb5abc69af9c27a9ee9d0b20863681
parent: 5404978825e174835932d9bf740e7538beb10898
author: James Zern <jzern@google.com>
date: Wed Sep 23 20:33:16 EDT 2015
Merge "VP9: Remove frame_parallel_decoding_mode from macroblockd"
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -176,7 +176,6 @@
int mb_to_bottom_edge;
FRAME_CONTEXT *fc;
- int frame_parallel_decoding_mode;
/* pointers to reference frames */
RefBuffer *block_refs[2];
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -364,7 +364,6 @@
memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant));
}
xd->fc = cm->fc;
- xd->frame_parallel_decoding_mode = cm->frame_parallel_decoding_mode;
}
xd->above_seg_context = cm->above_seg_context;