From: Alex Converse <aconverse@google.com>
Date: Mon, 23 Mar 2015 17:53:31 +0000 (-0700)
Subject: Simplify skip check.
X-Git-Tag: v1.5.0~822^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7605a9d7069f7d7a162dad3434aab3cbd142d72;p=libvpx

Simplify skip check.

SEG_LVL_SKIP implies skip. This is enforced by skip = write_skip().

Change-Id: I61c79581c9c53deae36685c2bcf388cb4d8827d3
---

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index b24fe2950..d67d1f4ea 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -268,8 +268,7 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, const MODE_INFO *mi,
     vp9_write(w, is_inter, vp9_get_intra_inter_prob(cm, xd));
 
   if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT &&
-      !(is_inter &&
-        (skip || vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP)))) {
+      !(is_inter && skip)) {
     write_selected_tx_size(cm, xd, w);
   }