libvpx: Pull from upstream

source/libvpx/vp8/decoder/decodeframe.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 16 matching lines @@
 
 #include "decodemv.h"
 #include "vp8/common/extend.h"
 #if CONFIG_ERROR_CONCEALMENT
 #include "error_concealment.h"
 #endif
 #include "vpx_mem/vpx_mem.h"
 #include "vp8/common/threading.h"
 #include "decoderthreading.h"
 #include "dboolhuff.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #include <assert.h>
 #include <stdio.h>
 
 void vp8cx_init_de_quantizer(VP8D_COMP *pbi)
 {
     int Q;
     VP8_COMMON *const pc = & pbi->common;
 
     for (Q = 0; Q < QINDEX_RANGE; Q++)
@@ skipping 967 matching lines @@
         pc->version = 0;
         pc->show_frame = 1;
         first_partition_length_in_bytes = 0;
     }
     else
     {
         unsigned char clear_buffer[10];
         const unsigned char *clear = data;
         if (pbi->decrypt_cb)
         {
-            int n = (int)MIN(sizeof(clear_buffer), data_end - data);
+            int n = (int)VPXMIN(sizeof(clear_buffer), data_end - data);
             pbi->decrypt_cb(pbi->decrypt_state, data, clear_buffer, n);
             clear = clear_buffer;
         }
 
         pc->frame_type = (FRAME_TYPE)(clear[0] & 1);
         pc->version = (clear[0] >> 1) & 7;
         pc->show_frame = (clear[0] >> 4) & 1;
         first_partition_length_in_bytes =
             (clear[0] | (clear[1] << 8) | (clear[2] << 16)) >> 5;
 
@@ skipping 354 matching lines @@
         FILE *f = fopen("decompressor.VP8", "ab");
         unsigned int size = pbi->bc2.pos + pbi->bc.pos + 8;
         fwrite((void *) &size, 4, 1, f);
         fwrite((void *) pbi->Source, size, 1, f);
         fclose(f);
     }
 #endif
 
     return 0;
 }