ref: 1b91f4193554d52c2851cfde8625b82c4ffe942b
parent: c3e290963d1e6112fa9f7212114493df67df5790
parent: c09b290ceadcced49e7b2ae37c24d2be0d1dd132
author: James Zern <jzern@google.com>
date: Tue Mar 14 15:21:42 EDT 2017
Merge "vp9/encoder: fix segfault on win32 using vs < 2015"
--- a/vp9/encoder/vp9_block.h
+++ b/vp9/encoder/vp9_block.h
@@ -63,6 +63,11 @@
typedef struct macroblock MACROBLOCK;
struct macroblock {+// cf. https://bugs.chromium.org/p/webm/issues/detail?id=1054
+#if defined(_MSC_VER) && _MSC_VER < 1900
+ int64_t bsse[MAX_MB_PLANE << 2];
+#endif
+
struct macroblock_plane plane[MAX_MB_PLANE];
MACROBLOCKD e_mbd;
@@ -149,7 +154,10 @@
#define SKIP_TXFM_AC_DC 1
#define SKIP_TXFM_AC_ONLY 2
+// cf. https://bugs.chromium.org/p/webm/issues/detail?id=1054
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
int64_t bsse[MAX_MB_PLANE << 2];
+#endif
// Used to store sub partition's choices.
MV pred_mv[MAX_REF_FRAMES];