generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9/encoder: fix segfault on win32 using vs < 2015"

Browse Source
This commit is contained in:
James Zern 2017-03-14 19:21:42 +00:00 committed by Gerrit Code Review
commit 1b91f41935
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_block.h
View File

@ -63,6 +63,11 @@ typedef struct {
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 @@ struct macroblock {
#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];