commit 5f22715cb6bc4f9fa2f11edaa7590ad9fc409fa6
author Yaowu Xu <yaowu@google.com> Tue Dec 12 13:04:44 2017 -0800
committer Cheng Chen <chengchen@google.com> Tue Dec 12 23:25:03 2017 +0000
tree 396f538d4ad053bf716038d28df87c6b500253df
parent 8265d70c92f50e3b4a8613802729f7be07852515

Fix compiler error when lpf_sb is on

Change-Id: I3801ba8ad8dc5229e95832e46753255ed536efba

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 4480385..de6b36a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2343,14 +2343,11 @@
 #endif  // CONFIG_INTRABC && !CONFIG_LPF_SB
   {
 // Loopfilter the whole frame.
-#if CONFIG_LPF_SB
-    av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
-                          cm->lf.filter_level, 0, 0, 0, 0);
-#else
+#if !CONFIG_LPF_SB
 #if CONFIG_OBU
     if (endTile == cm->tile_rows * cm->tile_cols - 1)
 #endif
-#if CONFIG_LOOPFILTER_LEVEL && !CONFIG_LPF_SB
+#if CONFIG_LOOPFILTER_LEVEL
       if (cm->lf.filter_level[0] || cm->lf.filter_level[1]) {
         av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
                               cm->lf.filter_level[0], cm->lf.filter_level[1], 0,
@@ -2362,7 +2359,7 @@
                               cm->lf.filter_level_v, cm->lf.filter_level_v, 2,
                               0);
       }
-#elif !CONFIG_LPF_SB
+#else
     av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
                           cm->lf.filter_level, 0, 0);
 #endif  // CONFIG_LOOPFILTER_LEVEL