From: Yunqing Wang <yunqingwang@google.com>
Date: Tue, 9 Apr 2013 19:33:28 +0000 (-0700)
Subject: Fix an issue in set_refs()
X-Git-Tag: v1.3.0~1106^2~296^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01a3bd67d8d043a5d186669602ee01252fbd8fe7;p=libvpx

Fix an issue in set_refs()

Scale factor for second ref frame wasn't assigned in the code.

Change-Id: I6ef3f3f71bd652a879ad847369c54c744782ea37
---

diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index 5e3fd6bc0..3e877b4a0 100644
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -990,6 +990,8 @@ static void set_refs(VP9D_COMP *pbi, int block_size, int mb_row, int mb_col) {
       // Select the appropriate reference frame for this MB
       const int second_fb_idx = cm->active_ref_idx[mbmi->second_ref_frame - 1];
       const YV12_BUFFER_CONFIG *second_cfg = &cm->yv12_fb[second_fb_idx];
+      xd->scale_factor[1]    = cm->active_ref_scale[mbmi->second_ref_frame - 1];
+      xd->scale_factor_uv[1] = cm->active_ref_scale[mbmi->second_ref_frame - 1];
       setup_pred_block(&xd->second_pre, second_cfg, mb_row, mb_col,
                        &xd->scale_factor[1], &xd->scale_factor_uv[1]);
       xd->corrupted |= second_cfg->corrupted;