libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_seg_common.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <assert.h>
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_seg_common.h"
 
 static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0, 0 };
 static const int seg_feature_data_max[SEG_LVL_MAX] =
-                 { MAXQ, 63, 0xf, MB_MODE_COUNT - 1, 255, TX_SIZE_MAX - 1};
+                 { MAXQ, 63, 0xf, MB_MODE_COUNT - 1, 255, TX_SIZE_MAX_SB - 1};
 
 // These functions provide access to new segment level features.
 // Eventually these function may be "optimized out" but for the moment,
 // the coding mechanism is still subject to change so these provide a
 // convenient single point of change.
 
 int vp9_segfeature_active(const MACROBLOCKD *xd,
                           int segment_id,
                           SEG_LVL_FEATURES feature_id) {
   // Return true if mask bit set and segmentation enabled.
@@ skipping 75 matching lines @@
           ~(1 << INTRA_FRAME)) ? 1 : 0;
 }
 
 int vp9_get_seg_tx_type(MACROBLOCKD *xd, int segment_id) {
   if (vp9_segfeature_active(xd, segment_id, SEG_LVL_TRANSFORM))
     return vp9_get_segdata(xd, segment_id, SEG_LVL_TRANSFORM);
   else
     return TX_4X4;
 }
 // TBD? Functions to read and write segment data with range / validity checking