diff options
| author | Jingning Han <jingning@google.com> | 2014-10-11 22:34:02 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-10-11 22:36:58 -0700 |
| commit | a62acf3c0ac35fc3763296f68dc02b23d65165ab (patch) | |
| tree | b2e47561731692cdfe7df08b7620e7bb929f4c02 /vp9/encoder/vp9_rdopt.c | |
| parent | a90255c366746d32c8485d7db7a5964d1e7bd8be (diff) | |
| download | libvpx-a62acf3c0ac35fc3763296f68dc02b23d65165ab.tar libvpx-a62acf3c0ac35fc3763296f68dc02b23d65165ab.tar.gz libvpx-a62acf3c0ac35fc3763296f68dc02b23d65165ab.tar.bz2 libvpx-a62acf3c0ac35fc3763296f68dc02b23d65165ab.zip | |
Fix ActiveMapTest valgrind warning
This fixes a valgrind warning in the ActiveMapTest unit test
reported in issue 870.
Change-Id: Idf172ab0244ebefe630c3577e649bc9ba7c43d10
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e66727293..462bdeb19 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) |