commit 8ea6e5bf4f3b05a40881a7785c1d44677ac02103
author Hui Su <huisu@google.com> Mon Feb 19 11:48:07 2018 -0800
committer Yaowu Xu <yaowu@google.com> Mon Feb 19 20:54:35 2018 +0000
tree 8ed09881303d61a6a4d5a7e6d5fc707c376cd5fb
parent c9fd473284499b48baccb27fa7494c5faa0dc4af

Reset filter-intra flag when intrabc is on

Change-Id: I19c49e5a5f0df0d767f156dcf006e5bf105bf6a0

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 9b64ba8..a0545de 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8892,6 +8892,9 @@
     assert((dv.col & 7) == 0);
     assert((dv.row & 7) == 0);
     memset(&mbmi->palette_mode_info, 0, sizeof(mbmi->palette_mode_info));
+#if CONFIG_FILTER_INTRA
+    mbmi->filter_intra_mode_info.use_filter_intra = 0;
+#endif  // CONFIG_FILTER_INTRA
     mbmi->use_intrabc = 1;
     mbmi->mode = DC_PRED;
     mbmi->uv_mode = UV_DC_PRED;