libvpx: Pull from upstream

source/libvpx/vp8/encoder/mr_dissim.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.
  */
 
@@ skipping 174 matching lines @@
                             {
                                 for (i=1; i< cnt; i++)
                                 {
                                     if (mvx[i] > max_mvx) max_mvx = mvx[i];
                                     else if (mvx[i] < min_mvx) min_mvx = mvx[i];
                                     if (mvy[i] > max_mvy) max_mvy = mvy[i];
                                     else if (mvy[i] < min_mvy) min_mvy = mvy[i];
                                 }
                             }
 
-                            mmvx = MAX(abs(min_mvx - here->mbmi.mv.as_mv.row),
-                                       abs(max_mvx - here->mbmi.mv.as_mv.row));
-                            mmvy = MAX(abs(min_mvy - here->mbmi.mv.as_mv.col),
-                                       abs(max_mvy - here->mbmi.mv.as_mv.col));
-                            dissim = MAX(mmvx, mmvy);
+                            mmvx = VPXMAX(
+                                abs(min_mvx - here->mbmi.mv.as_mv.row),
+                                abs(max_mvx - here->mbmi.mv.as_mv.row));
+                            mmvy = VPXMAX(
+                                abs(min_mvy - here->mbmi.mv.as_mv.col),
+                                abs(max_mvy - here->mbmi.mv.as_mv.col));
+                            dissim = VPXMAX(mmvx, mmvy);
                         }
                     }
 
                     /* Store mode info for next resolution encoding */
                     store_mode_info->mode = tmp->mbmi.mode;
                     store_mode_info->ref_frame = tmp->mbmi.ref_frame;
                     store_mode_info->mv.as_int = tmp->mbmi.mv.as_int;
                     store_mode_info->dissim = dissim;
                     tmp++;
                     store_mode_info++;
@@ skipping 18 matching lines @@
          * If parent frame is alt_ref, child has one too.
          */
         LOWER_RES_FRAME_INFO* store_info
                       = (LOWER_RES_FRAME_INFO*)cpi->oxcf.mr_low_res_mode_info;
 
         /* Set frame_type to be INTER_FRAME since we won't drop key frame. */
         store_info->frame_type = INTER_FRAME;
         store_info->is_frame_dropped = 1;
     }
 }