shithub: libvpx

Download patch

ref: 472669befb732396e10e15270059205683c73b8f
parent: fa9db8da150164dd8069d01c76fa663a82b114ae
author: Yaowu Xu <yaowu@google.com>
date: Thu Jun 6 18:10:07 EDT 2013

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

--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -547,7 +547,7 @@
   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) {
--