summaryrefslogtreecommitdiff
path: root/mozilla-1667096.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-1667096.patch')
-rw-r--r--mozilla-1667096.patch42
1 files changed, 21 insertions, 21 deletions
diff --git a/mozilla-1667096.patch b/mozilla-1667096.patch
index 8a82677..d2f2bf7 100644
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@@ -1,6 +1,6 @@
-diff -up firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-97.0/media/ffvpx/libavcodec/codec_list.c
---- firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 2022-02-08 10:21:17.151809054 +0100
-+++ firefox-97.0/media/ffvpx/libavcodec/codec_list.c 2022-02-08 10:25:11.374078784 +0100
+diff -up firefox-98.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-98.0/media/ffvpx/libavcodec/codec_list.c
+--- firefox-98.0/media/ffvpx/libavcodec/codec_list.c.1667096 2022-03-01 11:15:54.962398882 +0100
++++ firefox-98.0/media/ffvpx/libavcodec/codec_list.c 2022-03-01 11:17:46.605000755 +0100
@@ -11,6 +11,9 @@ static const AVCodec * const codec_list[
#if CONFIG_MP3_DECODER
&ff_mp3_decoder,
@@ -8,12 +8,12 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-97.0/m
+#ifdef CONFIG_LIBFDK_AAC
+ &ff_libfdk_aac_decoder,
+#endif
- #if CONFIG_AV1_DECODER
- &ff_av1_decoder,
+ #if CONFIG_LIBDAV1D
+ &ff_libdav1d_decoder,
#endif
-diff -up firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c
---- firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 2022-02-08 10:21:17.151809054 +0100
-+++ firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c 2022-02-08 10:21:17.151809054 +0100
+diff -up firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c
+--- firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 2022-03-01 11:15:54.963398914 +0100
++++ firefox-98.0/media/ffvpx/libavcodec/libfdk-aacdec.c 2022-03-01 11:15:54.963398914 +0100
@@ -0,0 +1,409 @@
+/*
+ * AAC decoder wrapper
@@ -424,12 +424,12 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-97.
+ FF_CODEC_CAP_INIT_CLEANUP,
+ .wrapper_name = "libfdk",
+};
-diff -up firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-97.0/media/ffvpx/libavcodec/moz.build
---- firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 2022-02-02 22:01:47.000000000 +0100
-+++ firefox-97.0/media/ffvpx/libavcodec/moz.build 2022-02-08 10:21:17.151809054 +0100
-@@ -111,6 +111,12 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
- ]
- USE_LIBS += ['mozva']
+diff -up firefox-98.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-98.0/media/ffvpx/libavcodec/moz.build
+--- firefox-98.0/media/ffvpx/libavcodec/moz.build.1667096 2022-03-01 11:15:54.963398914 +0100
++++ firefox-98.0/media/ffvpx/libavcodec/moz.build 2022-03-01 11:18:00.646453768 +0100
+@@ -123,6 +123,12 @@ if CONFIG['MOZ_LIBAV_FFT']:
+ 'avfft.c',
+ ]
+if CONFIG['MOZ_FDK_AAC']:
+ SOURCES += [
@@ -437,13 +437,13 @@ diff -up firefox-97.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-97.0/medi
+ ]
+ OS_LIBS += CONFIG['MOZ_FDK_AAC_LIBS']
+
- if CONFIG['MOZ_LIBAV_FFT']:
- SOURCES += [
- 'avfft.c',
-diff -up firefox-97.0/toolkit/moz.configure.1667096 firefox-97.0/toolkit/moz.configure
---- firefox-97.0/toolkit/moz.configure.1667096 2022-02-08 10:21:17.152809035 +0100
-+++ firefox-97.0/toolkit/moz.configure 2022-02-08 10:24:31.734885827 +0100
-@@ -1969,6 +1969,15 @@ with only_when(compile_environment):
+ SYMBOLS_FILE = 'avcodec.symbols'
+ NoVisibilityFlags()
+
+diff -up firefox-98.0/toolkit/moz.configure.1667096 firefox-98.0/toolkit/moz.configure
+--- firefox-98.0/toolkit/moz.configure.1667096 2022-03-01 11:15:54.881396269 +0100
++++ firefox-98.0/toolkit/moz.configure 2022-03-01 11:15:54.963398914 +0100
+@@ -1950,6 +1950,15 @@ with only_when(compile_environment):
set_config("MOZ_SYSTEM_PNG", True, when="--with-system-png")
bgstack15