75 lines
3.0 KiB
Diff
75 lines
3.0 KiB
Diff
diff -up firefox-140.1.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1 firefox-140.1.0/media/ffvpx/libavcodec/allcodecs.c
|
|
--- firefox-140.1.0/media/ffvpx/libavcodec/allcodecs.c.mozilla-bmo1789216-disable-av1 2025-07-14 19:14:53.000000000 +0200
|
|
+++ firefox-140.1.0/media/ffvpx/libavcodec/allcodecs.c 2025-07-31 15:12:56.818469857 +0200
|
|
@@ -769,8 +769,11 @@ extern const FFCodec ff_libaribb24_decod
|
|
extern const FFCodec ff_libcelt_decoder;
|
|
extern const FFCodec ff_libcodec2_encoder;
|
|
extern const FFCodec ff_libcodec2_decoder;
|
|
+#if CONFIG_MOZ_AV1
|
|
extern const FFCodec ff_libdav1d_decoder;
|
|
extern const FFCodec ff_libdavs2_decoder;
|
|
+extern const FFCodec ff_libuavs3d_decoder;
|
|
+#endif
|
|
extern const FFCodec ff_libfdk_aac_encoder;
|
|
extern const FFCodec ff_libfdk_aac_decoder;
|
|
extern const FFCodec ff_libgsm_encoder;
|
|
@@ -800,7 +803,6 @@ extern const FFCodec ff_libspeex_decoder
|
|
extern const FFCodec ff_libsvtav1_encoder;
|
|
extern const FFCodec ff_libtheora_encoder;
|
|
extern const FFCodec ff_libtwolame_encoder;
|
|
-extern const FFCodec ff_libuavs3d_decoder;
|
|
extern const FFCodec ff_libvo_amrwbenc_encoder;
|
|
extern const FFCodec ff_libvorbis_encoder;
|
|
extern const FFCodec ff_libvorbis_decoder;
|
|
diff -up firefox-140.1.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1 firefox-140.1.0/media/ffvpx/libavcodec/codec_list.c
|
|
--- firefox-140.1.0/media/ffvpx/libavcodec/codec_list.c.mozilla-bmo1789216-disable-av1 2025-07-14 19:14:53.000000000 +0200
|
|
+++ firefox-140.1.0/media/ffvpx/libavcodec/codec_list.c 2025-07-31 15:12:56.820214239 +0200
|
|
@@ -11,12 +11,14 @@ static const FFCodec * const codec_list[
|
|
#if CONFIG_MP3_DECODER
|
|
&ff_mp3_decoder,
|
|
#endif
|
|
+#if CONFIG_MOZ_AV1
|
|
#if CONFIG_LIBDAV1D
|
|
&ff_libdav1d_decoder,
|
|
#endif
|
|
#if CONFIG_AV1_DECODER
|
|
&ff_av1_decoder,
|
|
#endif
|
|
+#endif
|
|
#if CONFIG_LIBVORBIS_DECODER
|
|
&ff_libvorbis_decoder,
|
|
#endif
|
|
diff -up firefox-140.1.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1 firefox-140.1.0/media/ffvpx/libavcodec/moz.build
|
|
--- firefox-140.1.0/media/ffvpx/libavcodec/moz.build.mozilla-bmo1789216-disable-av1 2025-07-14 19:14:53.000000000 +0200
|
|
+++ firefox-140.1.0/media/ffvpx/libavcodec/moz.build 2025-08-01 12:40:58.374987298 +0200
|
|
@@ -94,7 +94,6 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
|
|
'imgconvert.c',
|
|
'libaom.c',
|
|
'libaomenc.c',
|
|
- 'libdav1d.c',
|
|
'libvpxdec.c',
|
|
'libvpxenc.c',
|
|
'mathtables.c',
|
|
@@ -120,16 +119,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
|
|
'vpx_rac.c',
|
|
]
|
|
|
|
- if CONFIG["MOZ_SYSTEM_AV1"]:
|
|
- CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
|
|
- CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS']
|
|
- OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
|
|
- OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS']
|
|
- else:
|
|
+ if CONFIG["MOZ_AV1"]:
|
|
USE_LIBS += [
|
|
'dav1d',
|
|
'media_libdav1d_asm',
|
|
]
|
|
+ SOURCES += [
|
|
+ 'libdav1d.c',
|
|
+ ]
|
|
+
|
|
|
|
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
|
LOCAL_INCLUDES += ['/media/mozva']
|