From b50359b886f2dc976de7e4a7887c45fbdb34649b Mon Sep 17 00:00:00 2001 From: Chun-Min Chang Date: Fri, 12 May 2023 01:08:58 +0000 Subject: [PATCH] Bug 1827664 - Remove custom changes for MSVC in libvpx r=padenot Gecko doesn't support msvc anymore. Differential Revision: https://phabricator.services.mozilla.com/D177518 --- media/libvpx/bug1137614.patch | 23 ----------------------- media/libvpx/moz.yaml | 1 - 2 files changed, 24 deletions(-) delete mode 100644 media/libvpx/bug1137614.patch diff --git a/media/libvpx/bug1137614.patch b/media/libvpx/bug1137614.patch deleted file mode 100644 index 9edc79722092..000000000000 --- a/media/libvpx/bug1137614.patch +++ /dev/null @@ -1,23 +0,0 @@ -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. diff --git a/media/libvpx/moz.yaml b/media/libvpx/moz.yaml index b0362992bde5..069d31fde120 100644 --- a/media/libvpx/moz.yaml +++ b/media/libvpx/moz.yaml @@ -53,7 +53,6 @@ vendoring: - tools/ patches: - - bug1137614.patch - input_frame_validation.patch - input_frame_validation_vp9.patch