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.
  */
 
 
 #include <limits.h>
 #include "vpx_config.h"
 #include "onyx_int.h"
 #include "mr_dissim.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "rdopt.h"
 #include "vp8/common/common.h"
-#include "vpx_dsp/vpx_dsp_common.h"
 
 void vp8_cal_low_res_mb_cols(VP8_COMP *cpi)
 {
     int low_res_w;
 
     /* Support arbitrary down-sampling factor */
     unsigned int iw = cpi->oxcf.Width*cpi->oxcf.mr_down_sampling_factor.den
                       + cpi->oxcf.mr_down_sampling_factor.num - 1;
 
     low_res_w = iw/cpi->oxcf.mr_down_sampling_factor.num;
@@ skipping 201 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;
     }
 }