From e726a40dcff44a745faac865eb721839718b4dbc Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Wed, 20 Apr 2022 16:18:24 +0000
Subject: [PATCH] Bug 1763991: Re-orient patches to align with mach vendor
 r=bryce

Differential Revision: https://phabricator.services.mozilla.com/D143632
---
 media/libvpx/bug1137614.patch                 | 6 +++---
 media/libvpx/input_frame_validation.patch     | 6 +++---
 media/libvpx/input_frame_validation_vp9.patch | 6 +++---
 media/libvpx/rename_duplicate_files.patch     | 6 +++---
 media/libvpx/win64_build_fix.patch            | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/media/libvpx/bug1137614.patch b/media/libvpx/bug1137614.patch
index 8ec90adf94dd..9edc79722092 100644
--- a/media/libvpx/bug1137614.patch
+++ b/media/libvpx/bug1137614.patch
@@ -1,6 +1,6 @@
-diff --git a/media/libvpx/libvpx/vp8/encoder/block.h b/media/libvpx/libvpx/vp8/encoder/block.h
---- a/media/libvpx/libvpx/vp8/encoder/block.h
-+++ b/media/libvpx/libvpx/vp8/encoder/block.h
+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;
diff --git a/media/libvpx/input_frame_validation.patch b/media/libvpx/input_frame_validation.patch
index 342eee000bf1..1cb33e192fd3 100644
--- a/media/libvpx/input_frame_validation.patch
+++ b/media/libvpx/input_frame_validation.patch
@@ -5,9 +5,9 @@ Bug 1263384: validate input frames against configured resolution in vp8 r=rillia
 
 MozReview-Commit-ID: BxDCnJe0mzs
 
-diff --git a/media/libvpx/libvpx/vp8/vp8_cx_iface.c b/media/libvpx/libvpx/vp8/vp8_cx_iface.c
---- a/media/libvpx/libvpx/vp8/vp8_cx_iface.c
-+++ b/media/libvpx/libvpx/vp8/vp8_cx_iface.c
+diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
+--- a/vp8/vp8_cx_iface.c
++++ b/vp8/vp8_cx_iface.c
 @@ -921,20 +921,29 @@ static vpx_codec_err_t vp8e_encode(vpx_c
      dst_time_stamp =
          pts_val * ctx->timestamp_ratio.num / ctx->timestamp_ratio.den;
diff --git a/media/libvpx/input_frame_validation_vp9.patch b/media/libvpx/input_frame_validation_vp9.patch
index 91828bec3a43..bcbfc9b4c2ba 100644
--- a/media/libvpx/input_frame_validation_vp9.patch
+++ b/media/libvpx/input_frame_validation_vp9.patch
@@ -3,9 +3,9 @@
 # Parent  87841f3bfc9d99a37e31cd43b2e2d03c325af84f
 Bug 1315288: Add input checks for VP9 r=rillian
 
-diff --git a/media/libvpx/libvpx/vp9/vp9_cx_iface.c b/media/libvpx/libvpx/vp9/vp9_cx_iface.c
---- a/media/libvpx/libvpx/vp9/vp9_cx_iface.c
-+++ b/media/libvpx/libvpx/vp9/vp9_cx_iface.c
+diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
+--- a/vp9/vp9_cx_iface.c
++++ b/vp9/vp9_cx_iface.c
 @@ -1353,21 +1353,30 @@ static vpx_codec_err_t encoder_encode(vp
      cpi->svc.time_stamp_superframe = dst_time_stamp;
 
diff --git a/media/libvpx/rename_duplicate_files.patch b/media/libvpx/rename_duplicate_files.patch
index fcb694742c69..58ebdc59e1ad 100644
--- a/media/libvpx/rename_duplicate_files.patch
+++ b/media/libvpx/rename_duplicate_files.patch
@@ -1,6 +1,6 @@
-diff --git a/media/libvpx/libvpx/vpx_dsp/vpx_dsp.mk b/media/libvpx/libvpx/vpx_dsp/vpx_dsp.mk
---- a/media/libvpx/libvpx/vpx_dsp/vpx_dsp.mk
-+++ b/media/libvpx/libvpx/vpx_dsp/vpx_dsp.mk
+diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
+--- a/vpx_dsp/vpx_dsp.mk
++++ b/vpx_dsp/vpx_dsp.mk
 @@ -160,17 +160,17 @@ DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve
  DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_horiz_dspr2.c
  DSP_SRCS-$(HAVE_DSPR2)  += mips/convolve8_vert_dspr2.c
diff --git a/media/libvpx/win64_build_fix.patch b/media/libvpx/win64_build_fix.patch
index 0825ecff8d9f..bfe0ed131a8e 100644
--- a/media/libvpx/win64_build_fix.patch
+++ b/media/libvpx/win64_build_fix.patch
@@ -1,6 +1,6 @@
-diff --git a/media/libvpx/libvpx/vpx_ports/vpx_ports.mk b/media/libvpx/libvpx/vpx_ports/vpx_ports.mk
---- a/media/libvpx/libvpx/vpx_ports/vpx_ports.mk
-+++ b/media/libvpx/libvpx/vpx_ports/vpx_ports.mk
+diff --git a/vpx_ports/vpx_ports.mk b/vpx_ports/vpx_ports.mk
+--- a/vpx_ports/vpx_ports.mk
++++ b/vpx_ports/vpx_ports.mk
 @@ -23,17 +23,17 @@ ifeq ($(VPX_ARCH_X86),yes)
  PORTS_SRCS-$(HAVE_MMX) += emms_mmx.c
  endif