From a62acf3c0ac35fc3763296f68dc02b23d65165ab Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Sat, 11 Oct 2014 22:34:02 -0700
Subject: [PATCH] Fix ActiveMapTest valgrind warning
This fixes a valgrind warning in the ActiveMapTest unit test
reported in issue 870.
Change-Id: Idf172ab0244ebefe630c3577e649bc9ba7c43d10
---
vp9/encoder/vp9_rdopt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index e667272939..462bdeb191 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3448,7 +3448,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
// updating code causes PSNR loss. Need to figure out the confliction.
x->skip |= best_mode_skippable;
- if (!best_mode_skippable && !x->select_tx_size) {
+ if (!x->skip && !x->select_tx_size) {
int has_high_freq_coeff = 0;
int plane;
int max_plane = is_inter_block(&xd->mi[0].src_mi->mbmi)
--
GitLab