summaryrefslogtreecommitdiffstats
path: root/media/libvpx/bug1137614.patch
diff options
context:
space:
mode:
Diffstat (limited to 'media/libvpx/bug1137614.patch')
-rw-r--r--media/libvpx/bug1137614.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/media/libvpx/bug1137614.patch b/media/libvpx/bug1137614.patch
new file mode 100644
index 0000000000..9edc797220
--- /dev/null
+++ b/media/libvpx/bug1137614.patch
@@ -0,0 +1,23 @@
+diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h
+--- a/vp8/encoder/block.h
++++ b/vp8/encoder/block.h
+@@ -87,17 +87,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
+ * them from extending outside the UMV borders.