libvpx: Pull from upstream

source/libvpx/vpx_dsp/prob.h

Index: source/libvpx/vpx_dsp/prob.h
diff --git a/source/libvpx/vpx_dsp/prob.h b/source/libvpx/vpx_dsp/prob.h
index 729f90a55f9d032c4d2634a7eae5b6d4c6e89388..c3cb103ffb5e8ca77f234eddbe01f3d304631176 100644
--- a/source/libvpx/vpx_dsp/prob.h
+++ b/source/libvpx/vpx_dsp/prob.h
@@ -65,7 +65,7 @@ static INLINE vpx_prob merge_probs(vpx_prob pre_prob,
                                    unsigned int count_sat,
                                    unsigned int max_update_factor) {
   const vpx_prob prob = get_binary_prob(ct[0], ct[1]);
-  const unsigned int count = MIN(ct[0] + ct[1], count_sat);
+  const unsigned int count = VPXMIN(ct[0] + ct[1], count_sat);
   const unsigned int factor = max_update_factor * count / count_sat;
   return weighted_prob(pre_prob, prob, factor);
 }
@@ -82,7 +82,7 @@ static INLINE vpx_prob mode_mv_merge_probs(vpx_prob pre_prob,
   if (den == 0) {
     return pre_prob;
   } else {
-    const unsigned int count = MIN(den, MODE_MV_COUNT_SAT);
+    const unsigned int count = VPXMIN(den, MODE_MV_COUNT_SAT);
     const unsigned int factor = count_to_update_factor[count];
     const vpx_prob prob =
         clip_prob(((int64_t)(ct[0]) * 256 + (den >> 1)) / den);