libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_seg_common.h

Index: source/libvpx/vp9/common/vp9_seg_common.h
diff --git a/source/libvpx/vp9/common/vp9_seg_common.h b/source/libvpx/vp9/common/vp9_seg_common.h
index ff2d66a36582c19727069e6d98a06b7cc41f61ee..95c9918303d8c4563478d64804a368398581522b 100644
--- a/source/libvpx/vp9/common/vp9_seg_common.h
+++ b/source/libvpx/vp9/common/vp9_seg_common.h
@@ -49,9 +49,12 @@ struct segmentation {
   unsigned int feature_mask[MAX_SEGMENTS];
 };
 
-int vp9_segfeature_active(const struct segmentation *seg,
-                          int segment_id,
-                          SEG_LVL_FEATURES feature_id);
+static INLINE int 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);
 
@@ -68,9 +71,10 @@ void vp9_set_segdata(struct segmentation *seg,
                      SEG_LVL_FEATURES feature_id,
                      int seg_data);
 
-int vp9_get_segdata(const struct segmentation *seg,
-                    int segment_id,
-                    SEG_LVL_FEATURES feature_id);
+static INLINE int get_segdata(const struct segmentation *seg, int segment_id,
+                              SEG_LVL_FEATURES feature_id) {
+  return seg->feature_data[segment_id][feature_id];
+}
 
 extern const vp9_tree_index vp9_segment_tree[TREE_SIZE(MAX_SEGMENTS)];