libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_mbpitch.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 "vp9/common/vp9_blockd.h"
 
 typedef enum {
   PRED = 0,
   DEST = 1
 } BLOCKSET;
 
-static void setup_block
-(
-  BLOCKD *b,
-  int mv_stride,
-  unsigned char **base,
-  unsigned char **base2,
-  int Stride,
-  int offset,
-  BLOCKSET bs
-) {
-
+static void setup_block(BLOCKD *b,
+                        int mv_stride,
+                        uint8_t **base,
+                        uint8_t **base2,
+                        int Stride,
+                        int offset,
+                        BLOCKSET bs) {
   if (bs == DEST) {
     b->dst_stride = Stride;
     b->dst = offset;
     b->base_dst = base;
   } else {
     b->pre_stride = Stride;
     b->pre = offset;
     b->base_pre = base;
     b->base_second_pre = base2;
   }
-
 }
 
-
 static void setup_macroblock(MACROBLOCKD *xd, BLOCKSET bs) {
   int block;
 
-  unsigned char **y, **u, **v;
-  unsigned char **y2 = NULL, **u2 = NULL, **v2 = NULL;
+  uint8_t **y, **u, **v;
+  uint8_t **y2 = NULL, **u2 = NULL, **v2 = NULL;
   BLOCKD *blockd = xd->block;
   int stride;
 
   if (bs == DEST) {
     y = &xd->dst.y_buffer;
     u = &xd->dst.u_buffer;
     v = &xd->dst.v_buffer;
   } else {
     y = &xd->pre.y_buffer;
     u = &xd->pre.u_buffer;
@@ skipping 51 matching lines @@
 
   blockd[24].diff = &xd->diff[384];
 
   for (r = 0; r < 25; r++) {
     blockd[r].qcoeff  = xd->qcoeff  + r * 16;
     blockd[r].dqcoeff = xd->dqcoeff + r * 16;
   }
 }
 
 void vp9_build_block_doffsets(MACROBLOCKD *xd) {
-
   /* handle the destination pitch features */
   setup_macroblock(xd, DEST);
   setup_macroblock(xd, PRED);
 }