Commit af631e1f authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "VP9: Remove frame_parallel_decoding_mode from macroblockd"

parents 30bd74cf 54049788
...@@ -176,7 +176,6 @@ typedef struct macroblockd { ...@@ -176,7 +176,6 @@ typedef struct macroblockd {
int mb_to_bottom_edge; int mb_to_bottom_edge;
FRAME_CONTEXT *fc; FRAME_CONTEXT *fc;
int frame_parallel_decoding_mode;
/* pointers to reference frames */ /* pointers to reference frames */
RefBuffer *block_refs[2]; RefBuffer *block_refs[2];
......
...@@ -364,7 +364,6 @@ static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd, ...@@ -364,7 +364,6 @@ static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd,
memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant)); memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant));
} }
xd->fc = cm->fc; xd->fc = cm->fc;
xd->frame_parallel_decoding_mode = cm->frame_parallel_decoding_mode;
} }
xd->above_seg_context = cm->above_seg_context; xd->above_seg_context = cm->above_seg_context;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment