f9adc4
diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
f9adc4
diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
f9adc4
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc
f9adc4
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old	2019-06-12 08:17:02.673268442 +0200
f9adc4
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc	2019-06-12 08:17:13.582328073 +0200
f9adc4
@@ -21,7 +21,7 @@
f9adc4
  *  be found in the AUTHORS file in the root of the source tree.
f9adc4
  */
f9adc4
 
f9adc4
-#include "modules/audio_processing//utility/ooura_fft.h"
f9adc4
+#include "modules/audio_processing/utility/ooura_fft.h"
f9adc4
 
f9adc4
 #include <math.h>
f9adc4
 
f9adc4
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
f9adc4
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old	2019-06-12 08:17:36.671454285 +0200
f9adc4
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc	2019-06-12 08:17:46.989510679 +0200
f9adc4
@@ -8,7 +8,7 @@
f9adc4
  *  be found in the AUTHORS file in the root of the source tree.
f9adc4
  */
f9adc4
 
f9adc4
-#include "modules/audio_processing//utility/ooura_fft.h"
f9adc4
+#include "modules/audio_processing/utility/ooura_fft.h"
f9adc4
 
f9adc4
 #include <emmintrin.h>
f9adc4
 
f9adc4
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
f9adc4
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old	2019-06-12 08:16:15.673011534 +0200
f9adc4
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c	2019-06-12 08:16:22.602049410 +0200
f9adc4
@@ -17,7 +17,7 @@
f9adc4
 #include "aom_dsp/blend.h"
f9adc4
 #include "aom/aom_integer.h"
f9adc4
 #include "aom_dsp/x86/synonyms.h"
f9adc4
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
f9adc4
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
f9adc4
 
f9adc4
 static INLINE unsigned int masked_sad32xh_avx2(
f9adc4
     const uint8_t *src_ptr, int src_stride, const uint8_t *a_ptr, int a_stride,
f9adc4
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
f9adc4
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old	2019-06-12 08:16:35.404119384 +0200
f9adc4
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c	2019-06-12 08:16:43.415163174 +0200
f9adc4
@@ -19,7 +19,7 @@
f9adc4
 #include "aom/aom_integer.h"
f9adc4
 #include "aom_dsp/x86/synonyms.h"
f9adc4
 
f9adc4
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
f9adc4
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
f9adc4
 
f9adc4
 // For width a multiple of 16
f9adc4
 static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,