Commit d94476d1 authored by Sebastien Alaiwan's avatar Sebastien Alaiwan Committed by James Zern

Fix double definition of 'pd'

This reverts commit a3d70911.

Reason for revert: this was fixed in cb637674 which moved the
definition to a different line causing this change to merge
cleanly, resulting in a duplicate.

Change-Id: I2d8763f0e2af320f043a1417ba33e82f82163592
parent d937cdbe
...@@ -5267,7 +5267,6 @@ static void joint_motion_search(const AV1_COMP *cpi, MACROBLOCK *x, ...@@ -5267,7 +5267,6 @@ static void joint_motion_search(const AV1_COMP *cpi, MACROBLOCK *x,
int ite, ref; int ite, ref;
struct scale_factors sf; struct scale_factors sf;
#if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION #if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
struct macroblockd_plane *const pd = &xd->plane[0];
// ic and ir are the 4x4 coordiantes of the sub8x8 at index "block" // ic and ir are the 4x4 coordiantes of the sub8x8 at index "block"
const int ic = block & 1; const int ic = block & 1;
const int ir = (block - ic) >> 1; const int ir = (block - ic) >> 1;
......
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