]> granicus.if.org Git - libvpx/commitdiff
Simplify skip check.
authorAlex Converse <aconverse@google.com>
Mon, 23 Mar 2015 17:53:31 +0000 (10:53 -0700)
committerAlex Converse <aconverse@google.com>
Mon, 23 Mar 2015 17:53:31 +0000 (10:53 -0700)
SEG_LVL_SKIP implies skip. This is enforced by skip = write_skip().

Change-Id: I61c79581c9c53deae36685c2bcf388cb4d8827d3

vp9/encoder/vp9_bitstream.c

index b24fe2950a1eeef07e0de65d29c00d972543f0c1..d67d1f4eae116bc0fd46787ec961ecd9f026131b 100644 (file)
@@ -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);
   }