[FFmpeg-cvslog] [ffmpeg-web] branch master updated. fa782f7 web/security: Add some CVE numbers from 2005 to 2010
The branch, master has been updated via fa782f7959a28ce823205d3cf24c512c1fbcc3b0 (commit) from 95909b6d5bf931a9fe27f45e53b942d8c8e12bcd (commit) - Log - commit fa782f7959a28ce823205d3cf24c512c1fbcc3b0 Author: Michael Niedermayer AuthorDate: Sun Mar 2 04:20:27 2025 +0100 Commit: Michael Niedermayer CommitDate: Sun Mar 2 04:22:10 2025 +0100 web/security: Add some CVE numbers from 2005 to 2010 This is painfull work, many of the links in old reports are broken, many companies webpages dont exist anymore Signed-off-by: Michael Niedermayer diff --git a/src/security b/src/security index 7b6f8dd..fef6a0b 100644 --- a/src/security +++ b/src/security @@ -3316,6 +3316,10 @@ Several security issues that dont have CVE numbers. 0.7 Fixes CVE-2011-2161 + +CVE-2010-3429, 6e73cef6e3b536fbccdb82bd9260440d836b3f03 +CVE-2010-4705, 366d919016a679d3955f6fe5278fa7ce4f47b81e + FFmpeg 0.6 0.6.5 @@ -3381,8 +3385,12 @@ CVE-2013-0868, 272e7f6443b76fb47192930d157bfd9284294188 / f67a0d1152544616494704 Fixes following vulnerabilities: +CVE-2008-3162, fdb5932e357e2e528b62130eefc8bf8bc1b12da2, issue311 +CVE-2008-3230, b08edb22684c1848b1c6186848585c324d9aae62, issue530 CVE-2008-4610 00bbe27631ddce543e00d5fbdee445c39fc84d7f +CVE-2008-4866, 0d84a8f6ae229aa09e0fb3f43f357f4977b136ef CVE-2008-4867 4df7beb3686caf2df345d2e10564aa8cf6c24a65 +CVE-2008-4868, 847d05360baf01c71c89cf9602fbbf5bd481c232 CVE-2009-0385 0838cfdc8a10185604db5cd9d6bffad71279a0e8 CVE-2016-1528 d99fbbf4d7e3f6abea0d052849a515730f552608 (partial, see c727401aa9d62335e89d118a5b4e202edf39d905) --- Summary of changes: src/security | 8 1 file changed, 8 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] swscale/aarch64: Refactor hscale_16_to_15__fs_4
ffmpeg | branch: master | Krzysztof Pyrkosz | Sat Mar 1
13:59:00 2025 +0100| [38929b824bcc4b3307af3e0711c5c03b823a83e3] | committer:
Martin Storsjö
swscale/aarch64: Refactor hscale_16_to_15__fs_4
This patch removes the use of stack for temporary state and replaces
interleaved ld4 loads with ld1.
Before/after:
A78
hscale_16_to_15__fs_4_dstW_8_neon: 86.8 ( 1.72x)
hscale_16_to_15__fs_4_dstW_24_neon:147.5 ( 2.73x)
hscale_16_to_15__fs_4_dstW_128_neon: 614.0 ( 3.14x)
hscale_16_to_15__fs_4_dstW_144_neon: 680.5 ( 3.18x)
hscale_16_to_15__fs_4_dstW_256_neon: 1193.2 ( 3.19x)
hscale_16_to_15__fs_4_dstW_512_neon: 2305.0 ( 3.27x)
hscale_16_to_15__fs_4_dstW_8_neon: 86.0 ( 1.74x)
hscale_16_to_15__fs_4_dstW_24_neon:106.8 ( 3.78x)
hscale_16_to_15__fs_4_dstW_128_neon: 404.0 ( 4.81x)
hscale_16_to_15__fs_4_dstW_144_neon: 451.8 ( 4.80x)
hscale_16_to_15__fs_4_dstW_256_neon: 760.5 ( 5.06x)
hscale_16_to_15__fs_4_dstW_512_neon: 1520.0 ( 5.01x)
A72
hscale_16_to_15__fs_4_dstW_8_neon: 156.8 ( 1.52x)
hscale_16_to_15__fs_4_dstW_24_neon:217.8 ( 2.52x)
hscale_16_to_15__fs_4_dstW_128_neon: 906.8 ( 2.90x)
hscale_16_to_15__fs_4_dstW_144_neon: 1014.5 ( 2.91x)
hscale_16_to_15__fs_4_dstW_256_neon: 1751.5 ( 2.96x)
hscale_16_to_15__fs_4_dstW_512_neon: 3469.3 ( 2.97x)
hscale_16_to_15__fs_4_dstW_8_neon: 151.2 ( 1.54x)
hscale_16_to_15__fs_4_dstW_24_neon:173.4 ( 3.15x)
hscale_16_to_15__fs_4_dstW_128_neon: 660.0 ( 3.98x)
hscale_16_to_15__fs_4_dstW_144_neon: 735.7 ( 4.00x)
hscale_16_to_15__fs_4_dstW_256_neon: 1273.5 ( 4.09x)
hscale_16_to_15__fs_4_dstW_512_neon: 2488.2 ( 4.16x)
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38929b824bcc4b3307af3e0711c5c03b823a83e3
---
libswscale/aarch64/hscale.S | 183 +---
1 file changed, 70 insertions(+), 113 deletions(-)
diff --git a/libswscale/aarch64/hscale.S b/libswscale/aarch64/hscale.S
index 435460c1af..4140fa9c60 100644
--- a/libswscale/aarch64/hscale.S
+++ b/libswscale/aarch64/hscale.S
@@ -638,6 +638,16 @@ function ff_hscale8to19_X4_neon, export=1
ret
endfunc
+
+.macro hscale_iter src, src2, filter, dst1, dst2
+uxtl\src\().4s, \src\().4h
+sxtlv19.4s, \filter\().4h
+mul \dst1\().4s, \src\().4s, v19.4s
+uxtl\src2\().4s, \src2\().4h
+sxtl2 \filter\().4s, \filter\().8h
+mul \dst2\().4s, \src2\().4s, \filter\().4s
+.endm
+
function ff_hscale16to15_4_neon_asm, export=1
// w0 int shift
// x1 int32_t *dst
@@ -664,6 +674,7 @@ function ff_hscale16to15_4_neon_asm, export=1
add x5, x5, #32
// shift all filterPos left by one, as uint16_t will be read
+ld1 {v28.8h, v29.8h, v30.8h, v31.8h}, [x4], #64 //
filter[0..7]
lsl x8, x8, #1
lsl x9, x9, #1
lsl x10, x10, #1
@@ -674,154 +685,101 @@ function ff_hscale16to15_4_neon_asm, export=1
lsl x15, x15, #1
// load src with given offset
-ldr x8, [x3, w8, uxtw]
-ldr x9, [x3, w9, uxtw]
-ldr x10, [x3, w10, uxtw]
-ldr x11, [x3, w11, uxtw]
-ldr x12, [x3, w12, uxtw]
-ldr x13, [x3, w13, uxtw]
-ldr x14, [x3, w14, uxtw]
-ldr x15, [x3, w15, uxtw]
-
-sub sp, sp, #64
-// push src on stack so it can be loaded into vectors later
-stp x8, x9, [sp]
-stp x10, x11, [sp, #16]
-stp x12, x13, [sp, #32]
-stp x14, x15, [sp, #48]
+ldr d0, [x3, w8, uxtw]
+ldr d1, [x3, w9, uxtw]
+ldr d2, [x3, w10, uxtw]
+ldr d3, [x3, w11, uxtw]
+ldr d4, [x3, w12, uxtw]
+ldr d5, [x3, w13, uxtw]
+ldr d6, [x3, w14, uxtw]
+ldr d7, [x3, w15, uxtw]
1:
-ld4 {v0.8h, v1.8h, v2.8h, v3.8h}, [sp]
-ld4 {v28.8h, v29.8h, v30.8h, v31.8h}, [x4], #64 //
filter[0..7]
-
-// Each of blocks does the following:
-// Extend src and filter to 32 bits with uxtl and sxtl
-// multiply or multiply and accumulate results
-// Extending to 32 bits is necessary, as unit16_t values can't
-// be represen
[FFmpeg-cvslog] libswscale/arm/swscale_unscaled: Fix function prototype
ffmpeg | branch: master | Adam Lackorzynski | Mon Feb 24
22:07:53 2025 +0100| [76b18100177843f443276e02a9592bbae9cd09c8] | committer:
Martin Storsjö
libswscale/arm/swscale_unscaled: Fix function prototype
Constify dstStrice argument of rgbx_to_nv12_neon_16_wrapper to be
compatible with other functions as used in function assignment.
Signed-off-by: Adam Lackorzynski
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76b18100177843f443276e02a9592bbae9cd09c8
---
libswscale/arm/swscale_unscaled.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libswscale/arm/swscale_unscaled.c
b/libswscale/arm/swscale_unscaled.c
index 5c3074a0cd..c526ea1c50 100644
--- a/libswscale/arm/swscale_unscaled.c
+++ b/libswscale/arm/swscale_unscaled.c
@@ -50,7 +50,7 @@ static int rgbx_to_nv12_neon_32_wrapper(SwsInternal *context,
const uint8_t *con
static int rgbx_to_nv12_neon_16_wrapper(SwsInternal *context, const uint8_t
*const src[],
const int srcStride[], int srcSliceY, int srcSliceH,
-uint8_t *const dst[], int dstStride[]) {
+uint8_t *const dst[], const int dstStride[]) {
rgbx_to_nv12_neon_16(src[0] + srcSliceY * srcStride[0],
dst[0] + srcSliceY * dstStride[0],
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 95909b6 web/security: Add more missing CVE#
The branch, master has been updated via 95909b6d5bf931a9fe27f45e53b942d8c8e12bcd (commit) from 66ff52e790b6bb71187c99c46a965f9eb00038b0 (commit) - Log - commit 95909b6d5bf931a9fe27f45e53b942d8c8e12bcd Author: Michael Niedermayer AuthorDate: Sat Mar 1 04:02:35 2025 +0100 Commit: Michael Niedermayer CommitDate: Sat Mar 1 04:02:35 2025 +0100 web/security: Add more missing CVE# Reported-by: Mouha, Nicky W Signed-off-by: Michael Niedermayer diff --git a/src/security b/src/security index b6d837f..7b6f8dd 100644 --- a/src/security +++ b/src/security @@ -1,5 +1,12 @@ Please report vulnerabilities to mailto:ffmpeg-secur...@ffmpeg.org";>ffmpeg-secur...@ffmpeg.org +FFmpeg git master + +Fixes following vulnerabilities: + + +CVE-2025-1373, 43be8d07281caca2e88bfd8ee2333633e1fb1a13, ticket/11460 never affected a release + FFmpeg 7.0 @@ -20,8 +27,9 @@ CVE-2023-49501, 4adb93dff05dd947878c67784d98c9a4e13b57a7, ticket/10686 CVE-2023-49502, 737ede405b11a37fdd61d19cf25df296a0cb0b75, ticket/10688 CVE-2023-50007, b1942734c7cbcdc9034034373abcc9ecb9644c47, ticket/10700 CVE-2023-50008, 5f87a68cf70dafeab2fb89b42e41a4c29053b89b, ticket/10701 -CVE-2024-31582, 99debe5f823f45a482e1dc08de35879aa9c74bd2 CVE-2024-28661, 66b50445cb36cf6adb49c2397362509aedb42c71 +CVE-2024-31578, 3bb00c0a420c3ce83c6fafee30270d69622ccad7 +CVE-2024-31582, 99debe5f823f45a482e1dc08de35879aa9c74bd2 CVE-2024-36617, d973fcbcc2f944752ff10e6a76b0b2d9329937a7 @@ -34,6 +42,7 @@ Fixes following vulnerabilities: CVE-2024-7055, d0ce252930357406a0435d0d783db4b1467345aa / 3faadbe2a27e74ff5bb5f7904ec27bb1f5287dc8 +CVE-2024-36617, d66b1af8df7902a3b6226f13410112d9ff27bfc4 / d973fcbcc2f944752ff10e6a76b0b2d9329937a7 6.1 --- Summary of changes: src/security | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/aarch64/ac3dsp_neon.S: Optimize ac3_sum_square_butterfly_int32_neon
ffmpeg | branch: master | Krzysztof Pyrkosz | Fri Feb 28
22:21:50 2025 +0100| [e8d4c559871ef93fc94a8efb8144f1738eba4c62] | committer:
Martin Storsjö
avcodec/aarch64/ac3dsp_neon.S: Optimize ac3_sum_square_butterfly_int32_neon
Instead of calculating a^2, b^2, (a+b)^2 and (a-b)^2, calculate only
a^2, b^2 and 2*a*b in each iteration and derive the latter parts from
these three at the end.
Before and after:
A78
ac3_sum_square_bufferfly_int32_neon: 484.8 ( 2.00x)
ac3_sum_square_bufferfly_int32_neon: 468.2 ( 2.08x)
A72
ac3_sum_square_bufferfly_int32_neon: 793.6 ( 1.26x)
ac3_sum_square_bufferfly_int32_neon: 527.3 ( 1.92x)
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8d4c559871ef93fc94a8efb8144f1738eba4c62
---
libavcodec/aarch64/ac3dsp_neon.S | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S
index 7e97cc39f7..c28e2082a9 100644
--- a/libavcodec/aarch64/ac3dsp_neon.S
+++ b/libavcodec/aarch64/ac3dsp_neon.S
@@ -69,21 +69,20 @@ function ff_ac3_sum_square_butterfly_int32_neon, export=1
moviv0.2d, #0
moviv1.2d, #0
moviv2.2d, #0
-moviv3.2d, #0
1: ld1 {v4.2s}, [x1], #8
ld1 {v5.2s}, [x2], #8
-add v6.2s, v4.2s, v5.2s
-sub v7.2s, v4.2s, v5.2s
-smlal v0.2d, v4.2s, v4.2s
-smlal v1.2d, v5.2s, v5.2s
-smlal v2.2d, v6.2s, v6.2s
-smlal v3.2d, v7.2s, v7.2s
subsw3, w3, #2
+smlal v0.2d, v4.2s, v4.2s // sum of a^2
+smlal v1.2d, v5.2s, v5.2s // sum of b^2
+sqdmlal v2.2d, v4.2s, v5.2s // sum of 2ab
b.gt1b
addpd0, v0.2d
addpd1, v1.2d
addpd2, v2.2d
-addpd3, v3.2d
+sub d3, d0, d2 // a^2 + b^2 - 2ab
+add d2, d0, d2
+add d3, d3, d1 // a^2 + b^2 + 2ab
+add d2, d2, d1
st1 {v0.1d-v3.1d}, [x0]
ret
endfunc
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] pixfmt: add AV_PIX_FMT_GRAY32
ffmpeg | branch: master | Lynne | Wed Jan 22 00:17:11 2025
+0900| [300b82c3eada64643a5d1ed2ffec5dde5849ba5e] | committer: Lynne
pixfmt: add AV_PIX_FMT_GRAY32
This is a useful format for high-precision intermediates.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=300b82c3eada64643a5d1ed2ffec5dde5849ba5e
---
libavutil/pixdesc.c | 21 +
libavutil/pixfmt.h | 4
2 files changed, 25 insertions(+)
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 6fe83cd16b..7ffc8f3b2e 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -797,6 +797,27 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.alias = "y16le",
},
+[AV_PIX_FMT_GRAY32BE] = {
+.name = "gray32be",
+.nb_components = 1,
+.log2_chroma_w = 0,
+.log2_chroma_h = 0,
+.comp = {
+{ 0, 4, 0, 0, 32 }, /* Y */
+},
+.flags = AV_PIX_FMT_FLAG_BE,
+.alias = "y32be",
+},
+[AV_PIX_FMT_GRAY32LE] = {
+.name = "gray32le",
+.nb_components = 1,
+.log2_chroma_w = 0,
+.log2_chroma_h = 0,
+.comp = {
+{ 0, 4, 0, 0, 32 }, /* Y */
+},
+.alias = "y32le",
+},
[AV_PIX_FMT_YUV440P] = {
.name = "yuv440p",
.nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index a64d40ad07..ca1b22762b 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -476,6 +476,9 @@ enum AVPixelFormat {
*/
AV_PIX_FMT_AMF_SURFACE,
+AV_PIX_FMT_GRAY32BE,///< Y, 32bpp, big-endian
+AV_PIX_FMT_GRAY32LE,///< Y, 32bpp, little-endian
+
AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you
want to link with shared libav* because the number of formats might differ
between versions
};
@@ -497,6 +500,7 @@ enum AVPixelFormat {
#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
+#define AV_PIX_FMT_GRAY32 AV_PIX_FMT_NE(GRAY32BE, GRAY32LE)
#define AV_PIX_FMT_YA16 AV_PIX_FMT_NE(YA16BE, YA16LE)
#define AV_PIX_FMT_RGB48 AV_PIX_FMT_NE(RGB48BE, RGB48LE)
#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] vulkan: add support for AV_PIX_FMT_GRAY32
ffmpeg | branch: master | Lynne | Wed Jan 22 00:17:12 2025
+0900| [629e8a2425ff2490207053c1e90ed649c3e6463c] | committer: Lynne
vulkan: add support for AV_PIX_FMT_GRAY32
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=629e8a2425ff2490207053c1e90ed649c3e6463c
---
libavutil/hwcontext_vulkan.c | 1 +
libavutil/vulkan.c | 7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 11d9e987b0..10521ce685 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -313,6 +313,7 @@ static const struct FFVkFormatEntry {
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY12, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY14, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
+{ VK_FORMAT_R32_UINT, AV_PIX_FMT_GRAY32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_UINT } },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_SFLOAT } },
/* RGB formats */
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 91415957fd..1d18bf07c1 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1430,6 +1430,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
};
return rep_tab[rep_fmt];
};
+case AV_PIX_FMT_GRAY32:
case AV_PIX_FMT_GRAYF32:
case AV_PIX_FMT_GBRPF32:
case AV_PIX_FMT_GBRAPF32: {
@@ -1539,10 +1540,10 @@ static VkFormat map_fmt_to_rep(VkFormat fmt, enum
FFVkShaderRepFormat rep_fmt)
{ REPS_FMT(VK_FORMAT_R16G16B16) },
{ REPS_FMT(VK_FORMAT_R16G16B16A16) },
{
+VK_FORMAT_R32_UINT,
VK_FORMAT_R32_SFLOAT,
-VK_FORMAT_R32_SFLOAT,
-VK_FORMAT_UNDEFINED,
-VK_FORMAT_UNDEFINED,
+VK_FORMAT_R32_SINT,
+VK_FORMAT_R32_UINT,
},
{
VK_FORMAT_R32G32B32_SFLOAT,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] ffbuild: Avoid using the --preprocessor argument to windres
ffmpeg | branch: release/3.4 | Martin Storsjö | Sat May 15 00:42:38 2021 +0300| [4767a711c131ee405876044bdc42b4c2254d] | committer: Leo Izen ffbuild: Avoid using the --preprocessor argument to windres Instead use --preprocessor-arg; in binutils 2.36, the --preprocessor flag was changed so that it no longer accepts a string containing multiple arguments, but the whole --preprocessor argument is treated as the path to the preprocessor executable (where the path can contain spaces). It's currently unclear whether this behaviour will stay or if it is going to be reverted in the future, see discussion at [1]. Just to be safe, avoid using the --preprocessor argument. Don't redeclare the full preprocessing command, but just add the $(CC_DEPFLAGS) options. Based on a patch by Kyle Schwartz. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=27594 Signed-off-by: Martin Storsjö > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4767a711c131ee405876044bdc42b4c2254d --- configure | 1 - ffbuild/common.mak | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 60977cd3f2..1d591ae103 100755 --- a/configure +++ b/configure @@ -6917,7 +6917,6 @@ LD_LIB=$LD_LIB LD_PATH=$LD_PATH DLLTOOL=$dlltool WINDRES=$windres -DEPWINDRES=$dep_cc DOXYGEN=$doxygen LDFLAGS=$LDFLAGS LDEXEFLAGS=$LDEXEFLAGS diff --git a/ffbuild/common.mak b/ffbuild/common.mak index e168fb2cfd..468b323715 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -83,7 +83,7 @@ COMPILE_NVCC = $(call COMPILE,NVCC) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) %.o: %.rc - $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< + $(WINDRES) $(IFLAGS) $(foreach ARG,$(CC_DEPFLAGS),--preprocessor-arg "$(ARG)") -o $@ $< %.i: %.c $(CC) $(CCFLAGS) $(CC_E) $< ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/iamf_parse: add checks to parameter definition durations
ffmpeg | branch: release/7.0 | James Almer | Wed Dec 11
23:27:00 2024 -0300| [5a8055a58ac7db8bd8837b44ab8e5c02adfb623c] | committer:
James Almer
avformat/iamf_parse: add checks to parameter definition durations
Section 3.6.1 of the IAMF spec states "When constant_subblock_duration is equal
to 0, the summation of all
subblock_duration in this parameter block SHALL be equal to duration.".
Signed-off-by: James Almer
(cherry picked from commit d38fc25519cf12a9212dadcba1258fc176ffbade)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a8055a58ac7db8bd8837b44ab8e5c02adfb623c
---
libavformat/iamf_parse.c | 14 --
libavformat/iamf_reader.c | 15 +--
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 5f2ad9fb5b..8d952cf203 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -498,6 +498,7 @@ static int param_parse(void *s, IAMFContext *c, AVIOContext
*pb,
AVIAMFParamDefinition *param;
unsigned int parameter_id, parameter_rate, mode;
unsigned int duration = 0, constant_subblock_duration = 0, nb_subblocks =
0;
+unsigned int total_duration = 0;
size_t param_size;
parameter_id = ffio_read_leb(pb);
@@ -518,8 +519,10 @@ static int param_parse(void *s, IAMFContext *c,
AVIOContext *pb,
constant_subblock_duration = ffio_read_leb(pb);
if (constant_subblock_duration == 0)
nb_subblocks = ffio_read_leb(pb);
-else
+else {
nb_subblocks = duration / constant_subblock_duration;
+total_duration = duration;
+}
}
param = av_iamf_param_definition_alloc(type, nb_subblocks, ¶m_size);
@@ -530,8 +533,10 @@ static int param_parse(void *s, IAMFContext *c,
AVIOContext *pb,
void *subblock = av_iamf_param_definition_get_subblock(param, i);
unsigned int subblock_duration = constant_subblock_duration;
-if (constant_subblock_duration == 0)
+if (constant_subblock_duration == 0) {
subblock_duration = ffio_read_leb(pb);
+total_duration += subblock_duration;
+}
switch (type) {
case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {
@@ -559,6 +564,11 @@ static int param_parse(void *s, IAMFContext *c,
AVIOContext *pb,
}
}
+if (!mode && !constant_subblock_duration && total_duration != duration) {
+av_log(s, AV_LOG_ERROR, "Invalid subblock durations in parameter_id
%u\n", parameter_id);
+return AVERROR_INVALIDDATA;
+}
+
param->parameter_id = parameter_id;
param->parameter_rate = parameter_rate;
param->duration = duration;
diff --git a/libavformat/iamf_reader.c b/libavformat/iamf_reader.c
index fa825cf287..b43ed76df4 100644
--- a/libavformat/iamf_reader.c
+++ b/libavformat/iamf_reader.c
@@ -108,6 +108,7 @@ static int parameter_block_obu(AVFormatContext *s,
IAMFDemuxContext *c,
AVIOContext *pb;
uint8_t *buf;
unsigned int duration, constant_subblock_duration;
+unsigned int total_duration = 0;
unsigned int nb_subblocks;
unsigned int parameter_id;
size_t out_param_size;
@@ -146,8 +147,10 @@ static int parameter_block_obu(AVFormatContext *s,
IAMFDemuxContext *c,
constant_subblock_duration = ffio_read_leb(pb);
if (constant_subblock_duration == 0)
nb_subblocks = ffio_read_leb(pb);
-else
+else {
nb_subblocks = duration / constant_subblock_duration;
+total_duration = duration;
+}
} else {
duration = param->duration;
constant_subblock_duration = param->constant_subblock_duration;
@@ -171,8 +174,10 @@ static int parameter_block_obu(AVFormatContext *s,
IAMFDemuxContext *c,
void *subblock = av_iamf_param_definition_get_subblock(out_param, i);
unsigned int subblock_duration = constant_subblock_duration;
-if (!param_definition->mode && !constant_subblock_duration)
+if (!param_definition->mode && !constant_subblock_duration) {
subblock_duration = ffio_read_leb(pb);
+total_duration += subblock_duration;
+}
switch (param->type) {
case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: {
@@ -234,6 +239,12 @@ static int parameter_block_obu(AVFormatContext *s,
IAMFDemuxContext *c,
av_log(s, level, "Underread in parameter_block_obu. %d bytes left at
the end\n", len);
}
+if (!param_definition->mode && !constant_subblock_duration &&
total_duration != duration) {
+av_log(s, AV_LOG_ERROR, "Invalid duration in parameter block\n");
+ret = AVERROR_INVALIDDATA;
+goto fail;
+}
+
switch (param->type) {
case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN:
av_free(c->mix);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To
[FFmpeg-cvslog] lavu: bump minor and add APIChanges entry for new GRAY32 pixfmts
ffmpeg | branch: master | Lynne | Sat Mar 1 13:25:29 2025 +0100| [0245e9382c748eba91645b65a377c4c9c4a44849] | committer: Lynne lavu: bump minor and add APIChanges entry for new GRAY32 pixfmts > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0245e9382c748eba91645b65a377c4c9c4a44849 --- doc/APIchanges | 3 +++ libavutil/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0778665152..5a64836e25 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2025-03-01 - xx - lavu 59.58.100 - pixfmt.h + Add AV_PIX_FMT_GRAY32BE and AV_PIX_FMT_GRAY32LE. + 2025-02-04 - xx - lavu 59.56.000 - pixfmt.h Add AV_PIX_FMT_AMF_SURFACE. diff --git a/libavutil/version.h b/libavutil/version.h index ee4a36cb17..4b584fd569 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 57 +#define LIBAVUTIL_VERSION_MINOR 58 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fate-sws-pixdesc-query: update ref for new pixfmts
ffmpeg | branch: master | Lynne | Sat Mar 1 20:12:54 2025 +0100| [ded677235927abb2c8cf4faebcf5b164ec39b6f8] | committer: Lynne fate-sws-pixdesc-query: update ref for new pixfmts > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ded677235927abb2c8cf4faebcf5b164ec39b6f8 --- tests/ref/fate/sws-pixdesc-query | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index 89eef20e4b..9a1d0d4b52 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -176,6 +176,7 @@ isBE: gray12be gray14be gray16be + gray32be gray9be grayf16be grayf32be @@ -595,6 +596,8 @@ Gray: gray14le gray16be gray16le + gray32be + gray32le gray9be gray9le grayf16be ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] APIChanges: add entries for new planar GBR and float gray pixfmts
ffmpeg | branch: master | Lynne | Sat Mar 1 13:21:15 2025 +0100| [a73760da537ccbdbdb4d67725222bcf1dfcc2723] | committer: Lynne APIChanges: add entries for new planar GBR and float gray pixfmts Was not done when the patches were pushed. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a73760da537ccbdbdb4d67725222bcf1dfcc2723 --- doc/APIchanges | 4 1 file changed, 4 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index ac506f4b56..86126014e8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2025-01-09 - xx - lavu 59.55.100 - pixfmt.h + Add AV_PIX_FMT_GBRPF16BE, AV_PIX_FMT_GBRPF16LE, AV_PIX_FMT_GBRAPF16BE, + AV_PIX_FMT_GBRAPF16LE, AV_PIX_FMT_GRAYF16BE, and AV_PIX_FMT_GRAYF16LE. + 2025-02-xx - xx - lavu 59.57.100 - log.h Add flags AV_LOG_PRINT_TIME and AV_LOG_PRINT_DATETIME. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] fate-imgutils: update reference for new pixel formats
ffmpeg | branch: master | Lynne | Sat Mar 1 20:08:50 2025 +0100| [e41b45509b7fb5dbddc225a559945f027738e1a2] | committer: Lynne fate-imgutils: update reference for new pixel formats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e41b45509b7fb5dbddc225a559945f027738e1a2 --- tests/ref/fate/imgutils | 4 1 file changed, 4 insertions(+) diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 40958a6395..0951bab161 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -290,6 +290,8 @@ gbrapf16be planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 gbrapf16le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 grayf16be planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144 grayf16le planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144 +gray32beplanes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +gray32leplanes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -527,3 +529,5 @@ gbrapf16be total_size: 24576, black_unknown_crc: 0x707ede8d, black_tv_cr gbrapf16le total_size: 24576, black_unknown_crc: 0x142a0205, black_tv_crc: 0x142a0205, black_pc_crc: 0x142a0205 grayf16be total_size: 6144, black_unknown_crc: 0x72aa7ce2, black_tv_crc: 0x72aa7ce2, black_pc_crc: 0x grayf16le total_size: 6144, black_unknown_crc: 0xad1b67c6, black_tv_crc: 0xad1b67c6, black_pc_crc: 0x +gray32betotal_size: 12288, black_unknown_crc: 0x52baa2c6, black_tv_crc: 0x52baa2c6, black_pc_crc: 0x +gray32letotal_size: 12288, black_unknown_crc: 0xc72f7e60, black_tv_crc: 0xc72f7e60, black_pc_crc: 0x ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] APIChanges: add entry for new AMD AMF pixfmt
ffmpeg | branch: master | Lynne | Sat Mar 1 13:24:28 2025 +0100| [0ef678f5c50658cb43791e62f910186e302b3a27] | committer: Lynne APIChanges: add entry for new AMD AMF pixfmt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ef678f5c50658cb43791e62f910186e302b3a27 --- doc/APIchanges | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 86126014e8..0778665152 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2025-02-04 - xx - lavu 59.56.000 - pixfmt.h + Add AV_PIX_FMT_AMF_SURFACE. + 2025-01-09 - xx - lavu 59.55.100 - pixfmt.h Add AV_PIX_FMT_GBRPF16BE, AV_PIX_FMT_GBRPF16LE, AV_PIX_FMT_GBRAPF16BE, AV_PIX_FMT_GBRAPF16LE, AV_PIX_FMT_GRAYF16BE, and AV_PIX_FMT_GRAYF16LE. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
