Correct the condition for border extension

As reported in issue #850, the condition for border extension was not
complete. This commit added the case when the scaling is enabled.

This fixes issue #850.

Change-Id: I67768b23f0dcc4ac9a9aa0a0825b0fe8cb85a72e

diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c
index faf5d65ca7f3166294ef4b7b6c9077868b3e9db8..e309904607b884fdc4cc4447c730be23d5aa99ca 100644 (file)
--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -463,7 +463,7 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
 
     // Do border extension if there is motion or the
     // width/height is not a multiple of 8 pixels.
-    if (scaled_mv.col || scaled_mv.row ||
+    if (vp9_is_scaled(sf) || scaled_mv.col || scaled_mv.row ||
         (frame_width & 0x7) || (frame_height & 0x7)) {
       // Get reference block bottom right coordinate.
       int x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1;