libvpx: Pull from upstream

source/libvpx/vp8/decoder/decodeframe.c

Index: source/libvpx/vp8/decoder/decodeframe.c
diff --git a/source/libvpx/vp8/decoder/decodeframe.c b/source/libvpx/vp8/decoder/decodeframe.c
index 56e167db913982a72e012d8ff300632baa48771a..8be8c164908ee1d99f044b7be45dd92fed527bbc 100644
--- a/source/libvpx/vp8/decoder/decodeframe.c
+++ b/source/libvpx/vp8/decoder/decodeframe.c
@@ -34,6 +34,7 @@
 #include "vp8/common/threading.h"
 #include "decoderthreading.h"
 #include "dboolhuff.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -1021,7 +1022,7 @@ int vp8_decode_frame(VP8D_COMP *pbi)
         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;
         }