From 472669befb732396e10e15270059205683c73b8f Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Thu, 6 Jun 2013 22:10:07 -0700
Subject: [PATCH] Fix a merge conflict
ref_frame in MB_Mode_Info was changed in the ref frame coding patch
to be an array to handle first and second reference frame, this patch
fix the loop filter code that use the pointer directly as reference
frame.
Change-Id: I71afa5a49deb50c1bc38029fd07470b984c6dfe9
---
vp9/common/vp9_loopfilter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c
index 089bb47d9e..e3d8e858d8 100644
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -547,7 +547,7 @@ static int build_lfi(const VP9_COMMON *cm, const MB_MODE_INFO *mbmi,
int mode = mbmi->mode;
int mode_index = lfi_n->mode_lf_lut[mode];
int seg = mbmi->segment_id;
- int ref_frame = mbmi->ref_frame;
+ int ref_frame = mbmi->ref_frame[0];
int filter_level = lfi_n->lvl[seg][ref_frame][mode_index];
if (filter_level) {
--
GitLab