libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_quant_common.c

Index: source/libvpx/vp9/common/vp9_quant_common.c
===================================================================
--- source/libvpx/vp9/common/vp9_quant_common.c	(revision 219822)
+++ source/libvpx/vp9/common/vp9_quant_common.c	(working copy)
@@ -130,12 +130,12 @@
 }
 
 
-int vp9_get_qindex(MACROBLOCKD *xd, int segment_id, int base_qindex) {
-  if (vp9_segfeature_active(&xd->seg, segment_id, SEG_LVL_ALT_Q)) {
-    const int data = vp9_get_segdata(&xd->seg, segment_id, SEG_LVL_ALT_Q);
-    return xd->seg.abs_delta == SEGMENT_ABSDATA ?
-               data :  // Abs value
-               clamp(base_qindex + data, 0, MAXQ);  // Delta value
+int vp9_get_qindex(struct segmentation *seg, int segment_id, int base_qindex) {
+  if (vp9_segfeature_active(seg, segment_id, SEG_LVL_ALT_Q)) {
+    const int data = vp9_get_segdata(seg, segment_id, SEG_LVL_ALT_Q);
+    return seg->abs_delta == SEGMENT_ABSDATA ?
+                             data :  // Abs value
+                             clamp(base_qindex + data, 0, MAXQ);  // Delta value
   } else {
     return base_qindex;
   }