libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_seg_common.c

Index: source/libvpx/vp9/common/vp9_seg_common.c
diff --git a/source/libvpx/vp9/common/vp9_seg_common.c b/source/libvpx/vp9/common/vp9_seg_common.c
index 910200ecc9c5ddf95d7d62a7c7685d5f4743ab52..471e238ccff54dacc9045f6bda65e47fd2eb8b7d 100644
--- a/source/libvpx/vp9/common/vp9_seg_common.c
+++ b/source/libvpx/vp9/common/vp9_seg_common.c
@@ -25,12 +25,6 @@ static const int seg_feature_data_max[SEG_LVL_MAX] = {
 // the coding mechanism is still subject to change so these provide a
 // convenient single point of change.
 
-int vp9_segfeature_active(const struct segmentation *seg, int segment_id,
-                          SEG_LVL_FEATURES feature_id) {
-  return seg->enabled &&
-         (seg->feature_mask[segment_id] & (1 << feature_id));
-}
-
 void vp9_clearall_segfeatures(struct segmentation *seg) {
   vp9_zero(seg->feature_data);
   vp9_zero(seg->feature_mask);
@@ -60,12 +54,6 @@ void vp9_set_segdata(struct segmentation *seg, int segment_id,
   seg->feature_data[segment_id][feature_id] = seg_data;
 }
 
-int vp9_get_segdata(const struct segmentation *seg, int segment_id,
-                    SEG_LVL_FEATURES feature_id) {
-  return seg->feature_data[segment_id][feature_id];
-}
-
-
 const vp9_tree_index vp9_segment_tree[TREE_SIZE(MAX_SEGMENTS)] = {
   2,  4,  6,  8, 10, 12,
   0, -1, -2, -3, -4, -5, -6, -7