gecko-dev/media/libvpx/bug1137614.patch
Ralph Giles fce6dd199a Bug 1173396 - Restore libvpx alignment patch. r=kinetik
The crash in vp8_diamond_search_sadx4 is reproducing again
so it looks like switching off unified build didn't fix
this.

--HG--
extra : rebase_source : 60517f781a17b3b26eec38d11bcc6a355ac09369
2015-06-10 09:31:00 -07:00

24 lines
834 B
Diff

diff --git a/media/libvpx/vp8/encoder/block.h b/media/libvpx/vp8/encoder/block.h
--- a/media/libvpx/vp8/encoder/block.h
+++ b/media/libvpx/vp8/encoder/block.h
@@ -93,17 +93,18 @@ typedef struct macroblock
int rddiv;
int rdmult;
unsigned int * mb_activity_ptr;
int * mb_norm_activity_ptr;
signed int act_zbin_adj;
signed int last_act_zbin_adj;
int *mvcost[2];
- int *mvsadcost[2];
+ /* MSVC generates code that thinks this is 16-byte aligned */
+ DECLARE_ALIGNED(16, int*, mvsadcost[2]);
int (*mbmode_cost)[MB_MODE_COUNT];
int (*intra_uv_mode_cost)[MB_MODE_COUNT];
int (*bmode_costs)[10][10];
int *inter_bmode_costs;
int (*token_costs)[COEF_BANDS][PREV_COEF_CONTEXTS]
[MAX_ENTROPY_TOKENS];
/* These define limits to motion vector components to prevent