Fix ActiveMapTest valgrind warning

This fixes a valgrind warning in the ActiveMapTest unit test
reported in issue 870.

Change-Id: Idf172ab0244ebefe630c3577e649bc9ba7c43d10

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index e6672729398d2ac0c198bf8a7318e2a9961f8730..462bdeb1917eaf8c336a686a6141d77cef2700c2 100644 (file)
--- 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)