diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /media/ffvpx | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'media/ffvpx')
| -rw-r--r-- | media/ffvpx/config_override.h | 2 | ||||
| -rw-r--r-- | media/ffvpx/libavcodec/avcodec.symbols | 2 | ||||
| -rw-r--r-- | media/ffvpx/libavcodec/moz.build | 6 | ||||
| -rw-r--r-- | media/ffvpx/libavutil/moz.build | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/media/ffvpx/config_override.h b/media/ffvpx/config_override.h index 5408abdd1a..20e80bb169 100644 --- a/media/ffvpx/config_override.h +++ b/media/ffvpx/config_override.h @@ -1,11 +1,9 @@ // This file contains overrides for config.h, that can be platform-specific. -#ifdef MOZ_LIBAV_FFT #undef CONFIG_FFT #undef CONFIG_RDFT #define CONFIG_FFT 1 #define CONFIG_RDFT 1 -#endif // override '#define EXTERN_ASM _' in config_generic.h to allow building with // gcc on arm diff --git a/media/ffvpx/libavcodec/avcodec.symbols b/media/ffvpx/libavcodec/avcodec.symbols index 6a9131322e..43d24bf39b 100644 --- a/media/ffvpx/libavcodec/avcodec.symbols +++ b/media/ffvpx/libavcodec/avcodec.symbols @@ -30,11 +30,9 @@ av_packet_free av_parser_close av_parser_init av_parser_parse2 -#ifdef MOZ_LIBAV_FFT av_rdft_calc av_rdft_end av_rdft_init -#endif av_shrink_packet av_vorbis_parse_frame av_vorbis_parse_frame_flags diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build index 420ed702b6..0ba603d172 100644 --- a/media/ffvpx/libavcodec/moz.build +++ b/media/ffvpx/libavcodec/moz.build @@ -22,6 +22,7 @@ SOURCES += [ 'allcodecs.c', 'avcodec.c', 'avdct.c', + 'avfft.c', 'avpacket.c', 'bitstream.c', 'bitstream_filters.c', @@ -145,11 +146,6 @@ else: CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"] OS_LIBS += CONFIG["MOZ_LIBVPX_LIBS"] -if CONFIG['MOZ_LIBAV_FFT']: - SOURCES += [ - 'avfft.c', - ] - SYMBOLS_FILE = 'avcodec.symbols' NoVisibilityFlags() diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build index f498eb677e..4839375c10 100644 --- a/media/ffvpx/libavutil/moz.build +++ b/media/ffvpx/libavutil/moz.build @@ -75,6 +75,10 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: ] USE_LIBS += ['mozva'] +EXPORTS.ffvpx = [ + "tx.h" +] + SYMBOLS_FILE = 'avutil.symbols' NoVisibilityFlags() |