111.0-1

git-svn-id: file:///srv/repos/svn-packages/svn@470779 eb2447ed-0c53-47e4-bac8-5bc4a241df78

Author: heftig

trunk/0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch renamed to trunk/0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch

@@ -182,7 +182,7 @@ Contains the following changes:
  copy dom/media/platforms/ffmpeg/{ffmpeg59 => ffmpeg60}/moz.build (100%)
 
 diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-index 4dac27ce41df..cd7a7dc2412b 100644
+index 94b929f1a095..4730a0bcc70a 100644
 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
 +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
 @@ -66,42 +66,47 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
@@ -18914,7 +18914,7 @@ index d2526d1ff487..e8141e6c4ffa 100644
 
  %if HAVE_AVX_EXTERNAL
 diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
-index 92c88205e19b..ba2fbfb7ba90 100644
+index c34577779bd7..65f2af3e093e 100644
 --- a/tools/rewriting/ThirdPartyPaths.txt
 +++ b/tools/rewriting/ThirdPartyPaths.txt
 @@ -31,6 +31,7 @@ dom/media/gmp/widevine-adapter/content_decryption_module_proxy.h