Ray molenkamp
21deba56aa
THis is bumping dependencies to fix known CVEs, with the exception of OpenImageIO which also includes bugfixes for performance and correctness with some image types. zlib 1.2.12 -> 1.2.13 freetype 2.11.1 -> 2.12.1 openimageio 2.3.13.0 -> 2.3.20.0 python 3.10.2 -> 3.10.8 openjpeg 2.4.0 -> 2.5.0 ffmpeg 5.0 -> 5.1.2 sndfile 1.0.28 -> 1.1.0 xml2 2.9.10 -> 2.10.3 expat 2.4.4 -> 2.4.9 openssl 1.1.1g/i -> 1.1.1q sqlite 3.31.1 -> 3.37.2 Notable changes: * AOM: the hack we had in place to make it not detect pthreads on windows no longer worked with a more recent cmake version. Disabled pthreads with a diff on Windows. * Python: embedded copy of zlib 2.1.12 swapped out for our 2.1.13 copy with some folder manipulation on Windows. * Freetype: was harbouring a copy of zlib 2.1.12 as well, so that had to end. * FFmpeg: patch used to fix D11796 is no longer needed. Add new patch to deal with simple_idct.asm generating an object file with no sections in it, backport from upstream commit. * TinyXML: still being downloaded but no longer used by OpenColorIO, removed. * GMP applied upstream patch to fix CVE-2021-43618, as there is no release yet. * SQLite and Libsndfile patches no longer needed. Includes contributes by Ray Molenkamp, Campbell Barton and Brecht Van Lommel. Ref T101403 Differential Revision: https://developer.blender.org/D16269
86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
--- a/configure 2018-08-27 13:46:41.071106150 +0200
|
|
+++ b/configure 2018-08-27 13:46:28.162765762 +0200
|
|
@@ -6013,7 +6013,7 @@
|
|
require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
|
|
enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
|
|
enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
|
|
- { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
|
|
+ { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version "-DOPJ_STATIC $pthreads_extralibs $libm_extralibs" && add_cppflags "-DOPJ_STATIC $pthreads_extralibs $libm_extralibs"; } }
|
|
enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
|
|
enabled libopus && {
|
|
enabled libopus_decoder && {
|
|
--- a/libavcodec/cfhddata.c
|
|
+++ b/libavcodec/cfhddata.c
|
|
@@ -276,10 +276,10 @@
|
|
av_cold int ff_cfhd_init_vlcs(CFHDContext *s)
|
|
{
|
|
int i, j, ret = 0;
|
|
- uint32_t new_cfhd_vlc_bits[NB_VLC_TABLE_18 * 2];
|
|
- uint8_t new_cfhd_vlc_len[NB_VLC_TABLE_18 * 2];
|
|
- uint16_t new_cfhd_vlc_run[NB_VLC_TABLE_18 * 2];
|
|
- int16_t new_cfhd_vlc_level[NB_VLC_TABLE_18 * 2];
|
|
+ uint32_t *new_cfhd_vlc_bits = av_calloc(sizeof(uint32_t), NB_VLC_TABLE_18 * 2);
|
|
+ uint8_t *new_cfhd_vlc_len = av_calloc(sizeof(uint8_t), NB_VLC_TABLE_18 * 2);
|
|
+ uint16_t *new_cfhd_vlc_run = av_calloc(sizeof(uint16_t), NB_VLC_TABLE_18 * 2);
|
|
+ int16_t *new_cfhd_vlc_level = av_calloc(sizeof(int16_t), NB_VLC_TABLE_18 * 2);
|
|
|
|
/** Similar to dv.c, generate signed VLC tables **/
|
|
|
|
@@ -305,8 +305,13 @@
|
|
|
|
ret = init_vlc(&s->vlc_9, VLC_BITS, j, new_cfhd_vlc_len,
|
|
1, 1, new_cfhd_vlc_bits, 4, 4, 0);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ av_free(new_cfhd_vlc_bits);
|
|
+ av_free(new_cfhd_vlc_len);
|
|
+ av_free(new_cfhd_vlc_run);
|
|
+ av_free(new_cfhd_vlc_level);
|
|
return ret;
|
|
+ }
|
|
for (i = 0; i < s->vlc_9.table_size; i++) {
|
|
int code = s->vlc_9.table[i][0];
|
|
int len = s->vlc_9.table[i][1];
|
|
@@ -346,8 +351,14 @@
|
|
|
|
ret = init_vlc(&s->vlc_18, VLC_BITS, j, new_cfhd_vlc_len,
|
|
1, 1, new_cfhd_vlc_bits, 4, 4, 0);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ av_free(new_cfhd_vlc_bits);
|
|
+ av_free(new_cfhd_vlc_len);
|
|
+ av_free(new_cfhd_vlc_run);
|
|
+ av_free(new_cfhd_vlc_level);
|
|
return ret;
|
|
+ }
|
|
+
|
|
av_assert0(s->vlc_18.table_size == 4572);
|
|
|
|
for (i = 0; i < s->vlc_18.table_size; i++) {
|
|
@@ -367,5 +378,10 @@
|
|
s->table_18_rl_vlc[i].run = run;
|
|
}
|
|
|
|
+ av_free(new_cfhd_vlc_bits);
|
|
+ av_free(new_cfhd_vlc_len);
|
|
+ av_free(new_cfhd_vlc_run);
|
|
+ av_free(new_cfhd_vlc_level);
|
|
+
|
|
return ret;
|
|
}
|
|
diff --git a/libavcodec/x86/simple_idct.asm b/libavcodec/x86/simple_idct.asm
|
|
index dcf0da6df121..982b2f0bbba1 100644
|
|
--- a/libavcodec/x86/simple_idct.asm
|
|
+++ b/libavcodec/x86/simple_idct.asm
|
|
@@ -25,9 +25,9 @@
|
|
|
|
%include "libavutil/x86/x86util.asm"
|
|
|
|
-%if ARCH_X86_32
|
|
SECTION_RODATA
|
|
|
|
+%if ARCH_X86_32
|
|
cextern pb_80
|
|
|
|
wm1010: dw 0, 0xffff, 0, 0xffff
|