September 2025 - ffmpeg-cvslog

[ffmpeg] branch master updated. 2451e06f19 all: Use "" instead of <> to include internal headers
by ffmpeg-git＠ffmpeg.org 04 Sep '25

04 Sep '25

The branch, master has been updated via 2451e06f19fe148456e4994b6f1259683cb04ef3 (commit) via 7dc4c4f6f5c80274ca719393e70f7e43b67d2c27 (commit) from 6696a9b8bd2eacf90d7bd199d37115ba12def793 (commit) - Log ----------------------------------------------------------------- commit 2451e06f19fe148456e4994b6f1259683cb04ef3 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Thu Sep 4 14:16:45 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 22:20:58 2025 +0200 all: Use "" instead of <> to include internal headers Reviewed-by: Niklas Haas <ffmpeg(a)haasn.dev> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c index 6af58d58c2..ef730d570b 100644 --- a/fftools/textformat/tf_mermaid.c +++ b/fftools/textformat/tf_mermaid.c @@ -27,10 +27,9 @@ #include "avtextformat.h" #include "tf_internal.h" #include "tf_mermaid.h" -#include <libavutil/mem.h> -#include <libavutil/avassert.h> -#include <libavutil/bprint.h> -#include <libavutil/opt.h> +#include "libavutil/bprint.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" static const char *init_directive = "" diff --git a/libavfilter/vf_colordetect.h b/libavfilter/vf_colordetect.h index 95f30a6ac2..aa974bb1fd 100644 --- a/libavfilter/vf_colordetect.h +++ b/libavfilter/vf_colordetect.h @@ -22,9 +22,8 @@ #include <stddef.h> #include <stdint.h> -#include <libavutil/avassert.h> -#include <libavutil/macros.h> -#include <libavutil/pixfmt.h> +#include "libavutil/avassert.h" +#include "libavutil/pixfmt.h" enum FFAlphaDetect { FF_ALPHA_NONE = -1, diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index dc3df0e989..1dc5486613 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -46,7 +46,7 @@ */ #include <float.h> -#include <libavutil/lfg.h> +#include "libavutil/lfg.h" #include "libavutil/opt.h" #include "libavutil/mem.h" #include "libavutil/fifo.h" diff --git a/libswscale/ops_optimizer.c b/libswscale/ops_optimizer.c index c28c2c36bb..b13e7ebdc1 100644 --- a/libswscale/ops_optimizer.c +++ b/libswscale/ops_optimizer.c @@ -19,7 +19,7 @@ */ #include "libavutil/avassert.h" -#include <libavutil/bswap.h> +#include "libavutil/bswap.h" #include "libavutil/rational.h" #include "ops.h" diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c index 8704f77227..3b5a060f64 100644 --- a/libswscale/x86/ops.c +++ b/libswscale/x86/ops.c @@ -20,8 +20,8 @@ #include <float.h> -#include <libavutil/avassert.h> -#include <libavutil/mem.h> +#include "libavutil/avassert.h" +#include "libavutil/mem.h" #include "../ops_chain.h" commit 7dc4c4f6f5c80274ca719393e70f7e43b67d2c27 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Thu Sep 4 14:01:20 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 22:14:39 2025 +0200 swscale/ops: Fix linking with x86 assembly disabled Reviewed-by: Niklas Haas <ffmpeg(a)haasn.dev> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libswscale/ops.c b/libswscale/ops.c index e8c05587e1..21aeb16931 100644 --- a/libswscale/ops.c +++ b/libswscale/ops.c @@ -33,7 +33,7 @@ extern const SwsOpBackend backend_x86; const SwsOpBackend * const ff_sws_op_backends[] = { &backend_murder, -#if ARCH_X86_64 +#if ARCH_X86_64 && HAVE_X86ASM &backend_x86, #endif &backend_c, ----------------------------------------------------------------------- Summary of changes: fftools/textformat/tf_mermaid.c | 7 +++---- libavfilter/vf_colordetect.h | 5 ++--- libavfilter/vf_deshake_opencl.c | 2 +- libswscale/ops.c | 2 +- libswscale/ops_optimizer.c | 2 +- libswscale/x86/ops.c | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 6696a9b8bd avcodec/mjpegdec: ignore APPx stubs unless AV_EF_EXPLODE is set
by ffmpeg-git＠ffmpeg.org 04 Sep '25

04 Sep '25

The branch, master has been updated via 6696a9b8bd2eacf90d7bd199d37115ba12def793 (commit) via e207520b82ec46c5cf12f7f71f38f142c88d51c8 (commit) from 9ee7796c540ce9cec3fdff0dd246de842228707b (commit) - Log ----------------------------------------------------------------- commit 6696a9b8bd2eacf90d7bd199d37115ba12def793 Author: Ramiro Polla <ramiro.polla(a)gmail.com> AuthorDate: Tue Oct 1 20:50:05 2024 +0200 Commit: Ramiro Polla <ramiro.polla(a)gmail.com> CommitDate: Thu Sep 4 15:28:41 2025 +0000 avcodec/mjpegdec: ignore APPx stubs unless AV_EF_EXPLODE is set Consider APPx fields that are too short to contain an id field (32-bit) as stubs, and ignore them if AV_EF_EXPLODE is not set. This has been seen in the MJPEG output from some webcams (such as the Logitech C270 and C920) and the JPEG images embedded in DNG images from the Pentax K-1 camera. diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c44d7f8181..3dde759fea 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1859,20 +1859,22 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) int len, id, i; len = get_bits(&s->gb, 16); - if (len < 6) { - if (s->bayer) { - // Pentax K-1 (digital camera) JPEG images embedded in DNG images contain unknown APP0 markers - av_log(s->avctx, AV_LOG_WARNING, "skipping APPx (len=%"PRId32") for bayer-encoded image\n", len); - skip_bits(&s->gb, len); - return 0; - } else + if (len < 2) + return AVERROR_INVALIDDATA; + len -= 2; + + if (len < 4) { + if (s->avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; + av_log(s->avctx, AV_LOG_VERBOSE, "skipping APPx stub (len=%" PRId32 ")\n", len); + goto out; } + if (8 * len > get_bits_left(&s->gb)) return AVERROR_INVALIDDATA; id = get_bits_long(&s->gb, 32); - len -= 6; + len -= 4; if (s->avctx->debug & FF_DEBUG_STARTCODE) av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n", commit e207520b82ec46c5cf12f7f71f38f142c88d51c8 Author: Ramiro Polla <ramiro.polla(a)gmail.com> AuthorDate: Thu Oct 17 13:00:11 2024 +0200 Commit: Ramiro Polla <ramiro.polla(a)gmail.com> CommitDate: Thu Sep 4 15:28:41 2025 +0000 avcodec/mjpegdec: fix skipping of bytes for unknown APPx markers The loop to skip the remaining bytes was off by one for all markers except for Adob. This patch uses post-decrement instead of pre-decrement in the while loop to make the len value easier to understand, and updates the len value to reflect this change for the Adob marker. diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4d6379805c..c44d7f8181 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1934,7 +1934,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) } if ( id == AV_RB32("Adob") - && len >= 7 + && len >= 8 && show_bits(&s->gb, 8) == 'e' && show_bits_long(&s->gb, 32) != AV_RB32("e_CM")) { skip_bits(&s->gb, 8); /* 'e' */ @@ -1944,7 +1944,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) s->adobe_transform = get_bits(&s->gb, 8); if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found, transform=%d\n", s->adobe_transform); - len -= 7; + len -= 8; goto out; } @@ -2153,7 +2153,7 @@ out: if (len < 0) av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n"); - while (--len > 0) + while (len-- > 0) skip_bits(&s->gb, 8); return 0; ----------------------------------------------------------------------- Summary of changes: libavcodec/mjpegdec.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 9ee7796c54 avcodec/librsvgdec: fix compilation with librsvg 2.50.3
by ffmpeg-git＠ffmpeg.org 04 Sep '25

04 Sep '25

The branch, master has been updated via 9ee7796c540ce9cec3fdff0dd246de842228707b (commit) from 2611874a50b101154e3c9932bd7f5d356d24ff85 (commit) - Log ----------------------------------------------------------------- commit 9ee7796c540ce9cec3fdff0dd246de842228707b Author: Andrey Semashev <andrey.semashev(a)gmail.com> AuthorDate: Tue Sep 2 01:07:05 2025 +0300 Commit: Leo Izen <leo.izen(a)gmail.com> CommitDate: Thu Sep 4 07:01:13 2025 -0400 avcodec/librsvgdec: fix compilation with librsvg 2.50.3 This fixes compilation with librsvg 2.50.3: error: viewport undeclared This was a regression since commit 86ed68420d3b60439d0b7767c53d0fdc1deb7277. Fixes #10722. Reviewed-by: Leo Izen <leo.izen(a)gmail.com> diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c index c328fbc774..f0566eb5d8 100644 --- a/libavcodec/librsvgdec.c +++ b/libavcodec/librsvgdec.c @@ -90,8 +90,6 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame, goto end; avctx->pix_fmt = AV_PIX_FMT_RGB32; - viewport.width = dimensions.width; - viewport.height = dimensions.height; ret = ff_get_buffer(avctx, frame, 0); if (ret < 0) @@ -116,6 +114,8 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame, cairo_restore(crender); #if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + viewport.width = dimensions.width; + viewport.height = dimensions.height; gret = rsvg_handle_render_document(handle, crender, &viewport, &error); #else cairo_scale(crender, dimensions.width / (double)unscaled_dimensions.width, ----------------------------------------------------------------------- Summary of changes: libavcodec/librsvgdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 2611874a50 avcodec/cbrt_tablegen: Deduplicate common code
by ffmpeg-git＠ffmpeg.org 04 Sep '25

04 Sep '25

The branch, master has been updated via 2611874a50b101154e3c9932bd7f5d356d24ff85 (commit) via 9bacefc41e5dea8f441c1babe250f5edb35f52f8 (commit) via cd337c46d503f393495e13a96571090bccdf4882 (commit) via 77e5e61f1a4ec16d03a513bf22d799446e7b6a34 (commit) from 37f02603b10b33bb5805a1f437680c261738df62 (commit) - Log ----------------------------------------------------------------- commit 2611874a50b101154e3c9932bd7f5d356d24ff85 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 3 02:53:46 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 10:15:09 2025 +0200 avcodec/cbrt_tablegen: Deduplicate common code Namely the part that creates a temporary LUT. Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3d036de4b6..ac143f4103 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -195,11 +195,13 @@ OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o OBJS-$(CONFIG_AAC_DECODER) += aactab.o \ aacsbr.o aacps_common.o aacps_float.o \ kbdwin.o \ - sbrdsp.o aacpsdsp_float.o cbrt_data.o + sbrdsp.o aacpsdsp_float.o cbrt_data.o \ + $(if $(!CONFIG_HARDCODED_TABLES), cbrt_tablegen_common.o) OBJS-$(CONFIG_AAC_FIXED_DECODER) += aactab.o \ aacsbr_fixed.o aacps_common.o aacps_fixed.o \ kbdwin.o \ - sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o + sbrdsp_fixed.o aacpsdsp_fixed.o cbrt_data_fixed.o \ + $(if $(!CONFIG_HARDCODED_TABLES), cbrt_tablegen_common.o) OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \ aacpsy.o aactab.o \ aacenc_is.o \ diff --git a/libavcodec/cbrt_data.h b/libavcodec/cbrt_data.h index bf84dca10d..8ae3b7651b 100644 --- a/libavcodec/cbrt_data.h +++ b/libavcodec/cbrt_data.h @@ -40,6 +40,11 @@ void ff_cbrt_tableinit(void); void ff_cbrt_tableinit_fixed(void); #define TMP_LUT_SIZE (LUT_SIZE / 2) +/** + * Creates a LUT (of doubles) for the powers of + * the odd integers: tmp_lut[idx] will be set to (2 * idx + 1)^{4/3}. + */ +void ff_cbrt_dbl_tableinit(double tmp_lut[TMP_LUT_SIZE]); extern union CBRT { uint32_t cbrt_tab[LUT_SIZE]; diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index bc040a87e6..90076dfd8e 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -46,34 +46,7 @@ av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) "unexpected sizeofs"); // We reuse ff_cbrt_tab_internal.tmp as a LUT (of doubles) for the roots // of the odd integers: tmp[idx] contains (2 * idx + 1)^{4/3}. - - for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) - AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] = 1; - - /* have to take care of non-squarefree numbers; notice that sqrt(LUT_SIZE) = 90; - * idx == 44 corresponds to 89. */ - for (int idx = 1; idx < 45; ++idx) { - if (AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] == 1) { - int i = 2 * idx + 1; - double cbrt_val = i * cbrt(i); - for (int k = i; k < LUT_SIZE; k *= i) { - // We only have to handle k, 3 * k, 5 * k,..., - // because only these are odd. The corresponding indices are - // k >> 1, (k >> 1) + k, (k >> 1) + 2 * k,... - for (int idx2 = k >> 1; idx2 < TMP_LUT_SIZE; idx2 += k) - AAC_RENAME(ff_cbrt_tab_internal).tmp[idx2] *= cbrt_val; - } - } - } - - for (int idx = 45; idx < TMP_LUT_SIZE; ++idx) { - if (AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] == 1) { - int i = 2 * idx + 1; - double cbrt_val = i * cbrt(i); - for (int idx2 = idx; idx2 < TMP_LUT_SIZE; idx2 += i) - AAC_RENAME(ff_cbrt_tab_internal).tmp[idx2] *= cbrt_val; - } - } + ff_cbrt_dbl_tableinit(AAC_RENAME(ff_cbrt_tab_internal).tmp); double cbrt_2 = 2 * cbrt(2); for (int idx = TMP_LUT_SIZE - 1; idx >= 0; --idx) { diff --git a/libavcodec/cbrt_tablegen_common.c b/libavcodec/cbrt_tablegen_common.c new file mode 100644 index 0000000000..9b95a6e44a --- /dev/null +++ b/libavcodec/cbrt_tablegen_common.c @@ -0,0 +1,60 @@ +/* + * Common code for AAC cube-root table + * + * Copyright (c) 2010 Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <math.h> + +#include "cbrt_data.h" +#include "libavutil/attributes.h" +#ifdef HAVE_AV_CONFIG_H // Only include libm.h when building for the target, not the host +#include "libavutil/libm.h" +#endif + +av_cold void ff_cbrt_dbl_tableinit(double tmp_lut[TMP_LUT_SIZE]) +{ + for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) + tmp_lut[idx] = 1; + + /* have to take care of non-squarefree numbers; notice that sqrt(LUT_SIZE) = 90; + * idx == 44 corresponds to 89. */ + for (int idx = 1; idx < 45; ++idx) { + if (tmp_lut[idx] == 1) { + int i = 2 * idx + 1; + double cbrt_val = i * cbrt(i); + for (int k = i; k < LUT_SIZE; k *= i) { + // We only have to handle k, 3 * k, 5 * k,..., + // because only these are odd. The corresponding indices are + // k >> 1, (k >> 1) + k, (k >> 1) + 2 * k,... + for (int idx2 = k >> 1; idx2 < TMP_LUT_SIZE; idx2 += k) + tmp_lut[idx2] *= cbrt_val; + } + } + } + + for (int idx = 45; idx < TMP_LUT_SIZE; ++idx) { + if (tmp_lut[idx] == 1) { + int i = 2 * idx + 1; + double cbrt_val = i * cbrt(i); + for (int idx2 = idx; idx2 < TMP_LUT_SIZE; idx2 += i) + tmp_lut[idx2] *= cbrt_val; + } + } +} diff --git a/libavcodec/cbrt_tablegen_template.c b/libavcodec/cbrt_tablegen_template.c index 06ae152f71..4f6aa7e484 100644 --- a/libavcodec/cbrt_tablegen_template.c +++ b/libavcodec/cbrt_tablegen_template.c @@ -24,6 +24,7 @@ #define BUILD_TABLES 1 #include "libavutil/tablegen.h" #include "cbrt_tablegen.h" +#include "cbrt_tablegen_common.c" #include "tableprint.h" int main(void) commit 9bacefc41e5dea8f441c1babe250f5edb35f52f8 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 2 23:06:32 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 10:15:03 2025 +0200 avcodec/cbrt_tablegen: Avoid LUT only used once This can be done by reusing the destination array to store a temporary LUT (with only half the amount of elements, but double the element size). This relies on certain assumptions about sizes, but they are always fulfilled for systems supported by us (sizeof(double) == 8 is needed/guaranteed since commit 3383a53e7d0abb9639c3ea3481f0eda9dca61a26). Furthermore, sizeof(uint32_t) is always >= four because CHAR_BIT is eight (in fact, sizeof(uint32_t) is four, because the exact width types don't have any padding). Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/cbrt_data.h b/libavcodec/cbrt_data.h index 89117f85b3..bf84dca10d 100644 --- a/libavcodec/cbrt_data.h +++ b/libavcodec/cbrt_data.h @@ -23,18 +23,31 @@ #include <stdint.h> +#define LUT_SIZE (1 << 13) + +#ifndef BUILD_TABLES #include "config.h" +#define BUILD_TABLES !CONFIG_HARDCODED_TABLES +#endif -#if CONFIG_HARDCODED_TABLES +#if !BUILD_TABLES #define ff_cbrt_tableinit_fixed() #define ff_cbrt_tableinit() -extern const uint32_t ff_cbrt_tab[1 << 13]; -extern const uint32_t ff_cbrt_tab_fixed[1 << 13]; +extern const uint32_t ff_cbrt_tab[LUT_SIZE]; +extern const uint32_t ff_cbrt_tab_fixed[LUT_SIZE]; #else void ff_cbrt_tableinit(void); void ff_cbrt_tableinit_fixed(void); -extern uint32_t ff_cbrt_tab[1 << 13]; -extern uint32_t ff_cbrt_tab_fixed[1 << 13]; + +#define TMP_LUT_SIZE (LUT_SIZE / 2) + +extern union CBRT { + uint32_t cbrt_tab[LUT_SIZE]; + double tmp[TMP_LUT_SIZE]; +} ff_cbrt_tab_internal, ff_cbrt_tab_internal_fixed; + +#define ff_cbrt_tab ff_cbrt_tab_internal.cbrt_tab +#define ff_cbrt_tab_fixed ff_cbrt_tab_internal_fixed.cbrt_tab #endif #endif diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 53ff79f570..bc040a87e6 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -23,11 +23,13 @@ #ifndef AVCODEC_CBRT_TABLEGEN_H #define AVCODEC_CBRT_TABLEGEN_H +#include <assert.h> #include <stdint.h> #include <math.h> #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "libavcodec/aac_defines.h" +#include "cbrt_data.h" #if USE_FIXED #define CBRT(x) lrint((x) * 8192) @@ -35,23 +37,23 @@ #define CBRT(x) av_float2int((float)(x)) #endif -#define LUT_SIZE (1 << 13) -#define TMP_LUT_SIZE (LUT_SIZE/2) - -uint32_t AAC_RENAME(ff_cbrt_tab)[LUT_SIZE]; +union CBRT AAC_RENAME(ff_cbrt_tab_internal); av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) { - // LUT of k^{4/3} for odd k; element idx corresponds to 2 * idx + 1. - static double cbrt_tab_dbl[TMP_LUT_SIZE]; + static_assert(2 * sizeof(AAC_RENAME(ff_cbrt_tab_internal).cbrt_tab[0]) + >= sizeof(AAC_RENAME(ff_cbrt_tab_internal).tmp[0]), + "unexpected sizeofs"); + // We reuse ff_cbrt_tab_internal.tmp as a LUT (of doubles) for the roots + // of the odd integers: tmp[idx] contains (2 * idx + 1)^{4/3}. for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) - cbrt_tab_dbl[idx] = 1; + AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] = 1; /* have to take care of non-squarefree numbers; notice that sqrt(LUT_SIZE) = 90; * idx == 44 corresponds to 89. */ for (int idx = 1; idx < 45; ++idx) { - if (cbrt_tab_dbl[idx] == 1) { + if (AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] == 1) { int i = 2 * idx + 1; double cbrt_val = i * cbrt(i); for (int k = i; k < LUT_SIZE; k *= i) { @@ -59,29 +61,33 @@ av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) // because only these are odd. The corresponding indices are // k >> 1, (k >> 1) + k, (k >> 1) + 2 * k,... for (int idx2 = k >> 1; idx2 < TMP_LUT_SIZE; idx2 += k) - cbrt_tab_dbl[idx2] *= cbrt_val; + AAC_RENAME(ff_cbrt_tab_internal).tmp[idx2] *= cbrt_val; } } } for (int idx = 45; idx < TMP_LUT_SIZE; ++idx) { - if (cbrt_tab_dbl[idx] == 1) { + if (AAC_RENAME(ff_cbrt_tab_internal).tmp[idx] == 1) { int i = 2 * idx + 1; double cbrt_val = i * cbrt(i); for (int idx2 = idx; idx2 < TMP_LUT_SIZE; idx2 += i) - cbrt_tab_dbl[idx2] *= cbrt_val; + AAC_RENAME(ff_cbrt_tab_internal).tmp[idx2] *= cbrt_val; } } double cbrt_2 = 2 * cbrt(2); - for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) { - double cbrt_val = cbrt_tab_dbl[idx]; + for (int idx = TMP_LUT_SIZE - 1; idx >= 0; --idx) { + double cbrt_val = AAC_RENAME(ff_cbrt_tab_internal).tmp[idx]; + // Due to i * sizeof(ff_cbrt_tab_internal.cbrt_tab[0]) >= + // 2 * idx * sizeof(ff_cbrt_tab_internal.cbrt_tab[0]) >= idx * sizeof(double) + // we don't clobber the double-LUT entries with index < idx + // in the loop below. This is why we process idx in descending order. for (int i = 2 * idx + 1; i < LUT_SIZE; i *= 2) { - AAC_RENAME(ff_cbrt_tab)[i] = CBRT(cbrt_val); + AAC_RENAME(ff_cbrt_tab_internal).cbrt_tab[i] = CBRT(cbrt_val); cbrt_val *= cbrt_2; } } - AAC_RENAME(ff_cbrt_tab)[0] = CBRT(0); + AAC_RENAME(ff_cbrt_tab_internal).cbrt_tab[0] = CBRT(0); } #endif /* AVCODEC_CBRT_TABLEGEN_H */ diff --git a/libavcodec/cbrt_tablegen_template.c b/libavcodec/cbrt_tablegen_template.c index 21ed2a6861..06ae152f71 100644 --- a/libavcodec/cbrt_tablegen_template.c +++ b/libavcodec/cbrt_tablegen_template.c @@ -21,7 +21,7 @@ */ #include <stdlib.h> -#define CONFIG_HARDCODED_TABLES 0 +#define BUILD_TABLES 1 #include "libavutil/tablegen.h" #include "cbrt_tablegen.h" #include "tableprint.h" commit cd337c46d503f393495e13a96571090bccdf4882 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 2 20:47:21 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 10:14:53 2025 +0200 avcodec/cbrt_tablegen: Reduce size of LUT only used once ff_cbrt_tableinit{,_fixed}() uses a LUT of doubles of the same size as the actual LUT to be initialized (8192 elems). Said LUT is only used to initialize another LUT, but because it is static, the dirty memory (64KiB) is not released. It is also too large to be put on the stack. This commit mitigates this: We only use a LUT for the powers of odd values, thereby halving its size. The generated LUT stays unchanged. Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index fae5d547aa..53ff79f570 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -35,37 +35,53 @@ #define CBRT(x) av_float2int((float)(x)) #endif -uint32_t AAC_RENAME(ff_cbrt_tab)[1 << 13]; +#define LUT_SIZE (1 << 13) +#define TMP_LUT_SIZE (LUT_SIZE/2) + +uint32_t AAC_RENAME(ff_cbrt_tab)[LUT_SIZE]; av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) { - static double cbrt_tab_dbl[1 << 13]; - int i, j, k; - double cbrt_val; + // LUT of k^{4/3} for odd k; element idx corresponds to 2 * idx + 1. + static double cbrt_tab_dbl[TMP_LUT_SIZE]; - for (i = 1; i < 1<<13; i++) - cbrt_tab_dbl[i] = 1; + for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) + cbrt_tab_dbl[idx] = 1; - /* have to take care of non-squarefree numbers */ - for (i = 2; i < 90; i++) { - if (cbrt_tab_dbl[i] == 1) { - cbrt_val = i * cbrt(i); - for (k = i; k < 1<<13; k *= i) - for (j = k; j < 1<<13; j += k) - cbrt_tab_dbl[j] *= cbrt_val; + /* have to take care of non-squarefree numbers; notice that sqrt(LUT_SIZE) = 90; + * idx == 44 corresponds to 89. */ + for (int idx = 1; idx < 45; ++idx) { + if (cbrt_tab_dbl[idx] == 1) { + int i = 2 * idx + 1; + double cbrt_val = i * cbrt(i); + for (int k = i; k < LUT_SIZE; k *= i) { + // We only have to handle k, 3 * k, 5 * k,..., + // because only these are odd. The corresponding indices are + // k >> 1, (k >> 1) + k, (k >> 1) + 2 * k,... + for (int idx2 = k >> 1; idx2 < TMP_LUT_SIZE; idx2 += k) + cbrt_tab_dbl[idx2] *= cbrt_val; } } + } - for (i = 91; i <= 8191; i+= 2) { - if (cbrt_tab_dbl[i] == 1) { - cbrt_val = i * cbrt(i); - for (j = i; j < 1<<13; j += i) - cbrt_tab_dbl[j] *= cbrt_val; - } + for (int idx = 45; idx < TMP_LUT_SIZE; ++idx) { + if (cbrt_tab_dbl[idx] == 1) { + int i = 2 * idx + 1; + double cbrt_val = i * cbrt(i); + for (int idx2 = idx; idx2 < TMP_LUT_SIZE; idx2 += i) + cbrt_tab_dbl[idx2] *= cbrt_val; } + } - for (i = 0; i < 1<<13; i++) - AAC_RENAME(ff_cbrt_tab)[i] = CBRT(cbrt_tab_dbl[i]); + double cbrt_2 = 2 * cbrt(2); + for (int idx = 0; idx < TMP_LUT_SIZE; ++idx) { + double cbrt_val = cbrt_tab_dbl[idx]; + for (int i = 2 * idx + 1; i < LUT_SIZE; i *= 2) { + AAC_RENAME(ff_cbrt_tab)[i] = CBRT(cbrt_val); + cbrt_val *= cbrt_2; + } + } + AAC_RENAME(ff_cbrt_tab)[0] = CBRT(0); } #endif /* AVCODEC_CBRT_TABLEGEN_H */ commit 77e5e61f1a4ec16d03a513bf22d799446e7b6a34 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 2 17:19:04 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Thu Sep 4 10:12:25 2025 +0200 avcodec/cbrt_tablegen: Remove always-false branch Each ff_cbrt_tableinit*() is called at most once, making this check always-false. Reviewed-by: Zhao Zhili <quinkblack(a)foxmail.com> Reviewed-by: Lynne <dev(a)lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 9af18d8ab5..fae5d547aa 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -40,7 +40,6 @@ uint32_t AAC_RENAME(ff_cbrt_tab)[1 << 13]; av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) { static double cbrt_tab_dbl[1 << 13]; - if (!AAC_RENAME(ff_cbrt_tab)[(1<<13) - 1]) { int i, j, k; double cbrt_val; @@ -67,7 +66,6 @@ av_cold void AAC_RENAME(ff_cbrt_tableinit)(void) for (i = 0; i < 1<<13; i++) AAC_RENAME(ff_cbrt_tab)[i] = CBRT(cbrt_tab_dbl[i]); - } } #endif /* AVCODEC_CBRT_TABLEGEN_H */ ----------------------------------------------------------------------- Summary of changes: libavcodec/Makefile | 6 ++-- libavcodec/cbrt_data.h | 28 +++++++++++++---- libavcodec/cbrt_tablegen.h | 47 +++++++++++++---------------- libavcodec/cbrt_tablegen_common.c | 60 +++++++++++++++++++++++++++++++++++++ libavcodec/cbrt_tablegen_template.c | 3 +- 5 files changed, 109 insertions(+), 35 deletions(-) create mode 100644 libavcodec/cbrt_tablegen_common.c hooks/post-receive --

1 0

[ffmpeg] branch master updated. 37f02603b1 avutil/hwcontext_drm: fix mapping when dst format is unset
by ffmpeg-git＠ffmpeg.org 04 Sep '25

04 Sep '25

The branch, master has been updated via 37f02603b10b33bb5805a1f437680c261738df62 (commit) from 858aa6176b5320e8f648461194a80cfda766de5a (commit) - Log ----------------------------------------------------------------- commit 37f02603b10b33bb5805a1f437680c261738df62 Author: Cameron Gutman <aicommander(a)gmail.com> AuthorDate: Wed Sep 3 20:21:51 2025 -0500 Commit: Cameron Gutman <aicommander(a)gmail.com> CommitDate: Wed Sep 3 20:21:51 2025 -0500 avutil/hwcontext_drm: fix mapping when dst format is unset av_hwframe_map() is documented to work with a blank dst frame, but hwcontext_drm currently fails if dst->format == AV_PIX_FMT_NONE. Signed-off-by: Cameron Gutman <aicommander(a)gmail.com> diff --git a/libavutil/hwcontext_drm.c b/libavutil/hwcontext_drm.c index 0847db09a0..565c02dead 100644 --- a/libavutil/hwcontext_drm.c +++ b/libavutil/hwcontext_drm.c @@ -288,7 +288,9 @@ static int drm_map_from(AVHWFramesContext *hwfc, AVFrame *dst, { int err; - if (hwfc->sw_format != dst->format) + if (dst->format == AV_PIX_FMT_NONE) + dst->format = hwfc->sw_format; + else if (hwfc->sw_format != dst->format) return AVERROR(ENOSYS); err = drm_map_frame(hwfc, dst, src, flags); ----------------------------------------------------------------------- Summary of changes: libavutil/hwcontext_drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 858aa6176b avutil/version: bump minor after recent change
by ffmpeg-git＠ffmpeg.org 03 Sep '25

03 Sep '25

The branch, master has been updated via 858aa6176b5320e8f648461194a80cfda766de5a (commit) from 79058e701493071b33b6c6f08a815d07aa6bcdb1 (commit) - Log ----------------------------------------------------------------- commit 858aa6176b5320e8f648461194a80cfda766de5a Author: Wu Jianhua <toqsxw(a)outlook.com> AuthorDate: Thu Sep 4 01:03:12 2025 +0800 Commit: Tong Wu <wutong1208(a)outlook.com> CommitDate: Wed Sep 3 22:34:40 2025 +0000 avutil/version: bump minor after recent change See c2ce387385996c4e6824116931930b08cfcaecc9 Signed-off-by: Wu Jianhua <toqsxw(a)outlook.com> diff --git a/libavutil/version.h b/libavutil/version.h index a1707d3f4e..99ca75bb16 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 60 -#define LIBAVUTIL_VERSION_MINOR 11 +#define LIBAVUTIL_VERSION_MINOR 12 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ ----------------------------------------------------------------------- Summary of changes: libavutil/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 79058e7014 avformat/demux: Reindent after the previous commit
by ffmpeg-git＠ffmpeg.org 03 Sep '25

03 Sep '25

The branch, master has been updated via 79058e701493071b33b6c6f08a815d07aa6bcdb1 (commit) via e6c03711aa447c553e8ec9f49b21d04a7d662809 (commit) via e918e202e0d0d8f30f2268c728bb503f9110b440 (commit) from a3360c0eafc7733ccfdba6cb109eca41b45a8165 (commit) - Log ----------------------------------------------------------------- commit 79058e701493071b33b6c6f08a815d07aa6bcdb1 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 3 20:48:07 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Sep 3 21:10:21 2025 +0000 avformat/demux: Reindent after the previous commit Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavformat/demux.c b/libavformat/demux.c index 6ced69a99b..cc0d57ae97 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -325,12 +325,12 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, } if (id3v2_extra_meta) { - if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) - goto close; - if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) - goto close; - if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0) - goto close; + if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) + goto close; + if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) + goto close; + if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0) + goto close; ff_id3v2_free_extra_meta(&id3v2_extra_meta); } commit e6c03711aa447c553e8ec9f49b21d04a7d662809 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 3 20:46:28 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Sep 3 21:10:21 2025 +0000 avformat/demux: Avoid always-true branch Since 9d037c54f209958d47ac376d2a9561608f98dfae id3v2_extra_meta can only be != NULL if the input format wants ID3v2 tags to be read generically. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavformat/demux.c b/libavformat/demux.c index 14776bc02f..6ced69a99b 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -325,15 +325,12 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, } if (id3v2_extra_meta) { - if (is_id3v2_format(s->iformat)) { if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) goto close; if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) goto close; if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0) goto close; - } else - av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n"); ff_id3v2_free_extra_meta(&id3v2_extra_meta); } commit e918e202e0d0d8f30f2268c728bb503f9110b440 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 3 20:38:48 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Sep 3 21:10:21 2025 +0000 avformat/avformat: Make AVFMT_FLAG_ID3V2_AUTO private This flag governs whether avformat_open_input() reads ID3v2 tags generically; some demuxers without this flag read these tags themselves in a non-generic way, e.g. oma. This makes this flag an implementation detail that should not be exposed to the user, i.e. an internal flag. Given that 9d037c54f209958d47ac376d2a9561608f98dfae did not bump version and added no APIchanges entry I deemded it inappropriate to bump version or add an APIchanges entry for the removal of AVFMT_FLAG_ID3V2_AUTO. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 21d63ce189..38ac9dcbe7 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -208,9 +208,10 @@ retry: const FFInputFormat ff_aac_demuxer = { .p.name = "aac", .p.long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), - .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, + .p.flags = AVFMT_GENERIC_INDEX, .p.extensions = "aac", .p.mime_type = "audio/aac,audio/aacp,audio/x-aac", + .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO, .read_probe = adts_aac_probe, .read_header = adts_aac_read_header, .read_packet = adts_aac_read_packet, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 75c8a4703b..be6e532387 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1435,7 +1435,6 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer -#define AVFMT_FLAG_ID3V2_AUTO 0x400000 ///< Automatically parse ID3v2 metadata /** * Maximum number of bytes read from input in order to determine stream diff --git a/libavformat/demux.c b/libavformat/demux.c index dfc146d9c4..14776bc02f 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -215,7 +215,7 @@ static int update_stream_avctx(AVFormatContext *s) } static av_always_inline int is_id3v2_format(const AVInputFormat *fmt) { - return fmt->flags & AVFMT_FLAG_ID3V2_AUTO; + return ffifmt(fmt)->flags_internal & FF_INFMT_FLAG_ID3V2_AUTO; } int avformat_open_input(AVFormatContext **ps, const char *filename, diff --git a/libavformat/demux.h b/libavformat/demux.h index 7c22c870e2..ab1c001c9f 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -39,6 +39,11 @@ struct AVDeviceInfoList; */ #define FF_INFMT_FLAG_PREFER_CODEC_FRAMERATE (1 << 1) +/** + * Automatically parse ID3v2 metadata + */ +#define FF_INFMT_FLAG_ID3V2_AUTO (1 << 2) + typedef struct FFInputFormat { /** * The public AVInputFormat. See avformat.h for it. diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 9cfc711493..5b153c7c9e 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -618,10 +618,11 @@ static const AVClass demuxer_class = { const FFInputFormat ff_mp3_demuxer = { .p.name = "mp3", .p.long_name = NULL_IF_CONFIG_SMALL("MP2/3 (MPEG audio layer 2/3)"), - .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, + .p.flags = AVFMT_GENERIC_INDEX, .p.extensions = "mp2,mp3,m2a,mpa", /* XXX: use probe */ .p.priv_class = &demuxer_class, .p.mime_type = "audio/mpeg", + .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO, .read_probe = mp3_read_probe, .read_header = mp3_read_header, .read_packet = mp3_read_packet, diff --git a/libavformat/tta.c b/libavformat/tta.c index 26335202c7..70642324af 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -191,9 +191,9 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp const FFInputFormat ff_tta_demuxer = { .p.name = "tta", .p.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), - .p.flags = AVFMT_FLAG_ID3V2_AUTO, .p.extensions = "tta", .priv_data_size = sizeof(TTAContext), + .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO, .read_probe = tta_probe, .read_header = tta_read_header, .read_packet = tta_read_packet, diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 4c47a5f05c..7d701c517a 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -1011,10 +1011,11 @@ static const AVClass w64_demuxer_class = { const FFInputFormat ff_w64_demuxer = { .p.name = "w64", .p.long_name = NULL_IF_CONFIG_SMALL("Sony Wave64"), - .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, + .p.flags = AVFMT_GENERIC_INDEX, .p.codec_tag = ff_wav_codec_tags_list, .p.priv_class = &w64_demuxer_class, .priv_data_size = sizeof(WAVDemuxContext), + .flags_internal = FF_INFMT_FLAG_ID3V2_AUTO, .read_probe = w64_probe, .read_header = w64_read_header, .read_packet = wav_read_packet, ----------------------------------------------------------------------- Summary of changes: libavformat/aacdec.c | 3 ++- libavformat/avformat.h | 1 - libavformat/demux.c | 17 +++++++---------- libavformat/demux.h | 5 +++++ libavformat/mp3dec.c | 3 ++- libavformat/tta.c | 2 +- libavformat/wavdec.c | 3 ++- 7 files changed, 19 insertions(+), 15 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. a3360c0eaf swscale: Don't pass a concrete SwsOpPriv as parameter
by ffmpeg-git＠ffmpeg.org 03 Sep '25

03 Sep '25

The branch, master has been updated via a3360c0eafc7733ccfdba6cb109eca41b45a8165 (commit) from 9d037c54f209958d47ac376d2a9561608f98dfae (commit) - Log ----------------------------------------------------------------- commit a3360c0eafc7733ccfdba6cb109eca41b45a8165 Author: Martin Storsjö <martin(a)martin.st> AuthorDate: Wed Sep 3 14:03:28 2025 +0300 Commit: Martin Storsjö <martin(a)martin.st> CommitDate: Wed Sep 3 20:18:03 2025 +0000 swscale: Don't pass a concrete SwsOpPriv as parameter This fixes the following compiler error, if compiling with MSVC for ARM (32 bit): src/libswscale/ops_chain.c(48): error C2719: 'priv': formal parameter with requested alignment of 16 won't be aligned This change shouldn't affect the performance of this operation (which in itself probably isn't relevant); instead of copying the contents of the SwsOpPriv struct from the stack as parameter, it gets copied straight from the caller function's stack frame instead. Separately from this issue, MSVC 17.8 and 17.9 end up in an internal compiler error when compiling libswscale/ops.c, but older and newer versions do compile it successfully. diff --git a/libswscale/ops_chain.c b/libswscale/ops_chain.c index 5d138a9e46..80162507b0 100644 --- a/libswscale/ops_chain.c +++ b/libswscale/ops_chain.c @@ -45,7 +45,7 @@ void ff_sws_op_chain_free(SwsOpChain *chain) } int ff_sws_op_chain_append(SwsOpChain *chain, SwsFuncPtr func, - void (*free)(void *), SwsOpPriv priv) + void (*free)(void *), const SwsOpPriv *priv) { const int idx = chain->num_impl; if (idx == SWS_MAX_OPS) @@ -53,7 +53,7 @@ int ff_sws_op_chain_append(SwsOpChain *chain, SwsFuncPtr func, av_assert1(func); chain->impl[idx].cont = func; - chain->impl[idx + 1].priv = priv; + chain->impl[idx + 1].priv = *priv; chain->free[idx + 1] = free; chain->num_impl++; return 0; @@ -231,7 +231,7 @@ int ff_sws_op_compile_tables(const SwsOpTable *const tables[], int num_tables, } chain->cpu_flags |= best_cpu_flags; - ret = ff_sws_op_chain_append(chain, best->func, best->free, priv); + ret = ff_sws_op_chain_append(chain, best->func, best->free, &priv); if (ret < 0) { if (best->free) best->free(&priv); diff --git a/libswscale/ops_chain.h b/libswscale/ops_chain.h index 777d8e13c1..ceff7e4e7e 100644 --- a/libswscale/ops_chain.h +++ b/libswscale/ops_chain.h @@ -90,7 +90,7 @@ void ff_sws_op_chain_free(SwsOpChain *chain); /* Returns 0 on success, or a negative error code. */ int ff_sws_op_chain_append(SwsOpChain *chain, SwsFuncPtr func, - void (*free)(void *), SwsOpPriv priv); + void (*free)(void *), const SwsOpPriv *priv); typedef struct SwsOpEntry { /* Kernel metadata; reduced size subset of SwsOp */ diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c index b3fe5fb014..8704f77227 100644 --- a/libswscale/x86/ops.c +++ b/libswscale/x86/ops.c @@ -695,7 +695,7 @@ static int compile(SwsContext *ctx, SwsOpList *ops, SwsCompiledOp *out) SWS_DECL_FUNC(NAME); \ void NAME##_return(void); \ ret = ff_sws_op_chain_append(chain, NAME##_return, \ - NULL, (SwsOpPriv) {0}); \ + NULL, &(SwsOpPriv) {0}); \ out->func = NAME; \ } while (0) ----------------------------------------------------------------------- Summary of changes: libswscale/ops_chain.c | 6 +++--- libswscale/ops_chain.h | 2 +- libswscale/x86/ops.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 9d037c54f2 avformat/demux: avoid unconditional ID3v2 tag consumption
by ffmpeg-git＠ffmpeg.org 03 Sep '25

03 Sep '25

The branch, master has been updated via 9d037c54f209958d47ac376d2a9561608f98dfae (commit) from cd21fa41c70bdc03660e0566649e9cf2bd7441b7 (commit) - Log ----------------------------------------------------------------- commit 9d037c54f209958d47ac376d2a9561608f98dfae Author: nilfm <nil.fons(a)gmail.com> AuthorDate: Wed Jul 2 14:37:24 2025 -0400 Commit: Kyle Swanson <kswanson(a)netflix.com> CommitDate: Wed Sep 3 10:44:02 2025 -0700 avformat/demux: avoid unconditional ID3v2 tag consumption ID3v2 headers are now only parsed for formats that explicitly support them, avoiding premature data consumption that broke demuxing in other formats. Introduces AVFMT_FLAG_ID3V2_AUTO and applies it to mp3, aac, tta, and wav. Signed-off-by: nilfm <nil.fons(a)gmail.com> diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 0b4bd69dd2..21d63ce189 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -208,7 +208,7 @@ retry: const FFInputFormat ff_aac_demuxer = { .p.name = "aac", .p.long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), - .p.flags = AVFMT_GENERIC_INDEX, + .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, .p.extensions = "aac", .p.mime_type = "audio/aac,audio/aacp,audio/x-aac", .read_probe = adts_aac_probe, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index be6e532387..75c8a4703b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1435,6 +1435,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer +#define AVFMT_FLAG_ID3V2_AUTO 0x400000 ///< Automatically parse ID3v2 metadata /** * Maximum number of bytes read from input in order to determine stream diff --git a/libavformat/demux.c b/libavformat/demux.c index 3749ab67a3..dfc146d9c4 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -214,6 +214,10 @@ static int update_stream_avctx(AVFormatContext *s) return 0; } +static av_always_inline int is_id3v2_format(const AVInputFormat *fmt) { + return fmt->flags & AVFMT_FLAG_ID3V2_AUTO; +} + int avformat_open_input(AVFormatContext **ps, const char *filename, const AVInputFormat *fmt, AVDictionary **options) { @@ -302,7 +306,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, } /* e.g. AVFMT_NOFILE formats will not have an AVIOContext */ - if (s->pb) + if (s->pb && is_id3v2_format(s->iformat)) ff_id3v2_read_dict(s->pb, &si->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); if (ffifmt(s->iformat)->read_header) @@ -321,8 +325,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, } if (id3v2_extra_meta) { - if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") || - !strcmp(s->iformat->name, "tta") || !strcmp(s->iformat->name, "wav")) { + if (is_id3v2_format(s->iformat)) { if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0) goto close; if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 31eeb68ebb..9cfc711493 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -618,7 +618,7 @@ static const AVClass demuxer_class = { const FFInputFormat ff_mp3_demuxer = { .p.name = "mp3", .p.long_name = NULL_IF_CONFIG_SMALL("MP2/3 (MPEG audio layer 2/3)"), - .p.flags = AVFMT_GENERIC_INDEX, + .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, .p.extensions = "mp2,mp3,m2a,mpa", /* XXX: use probe */ .p.priv_class = &demuxer_class, .p.mime_type = "audio/mpeg", diff --git a/libavformat/tta.c b/libavformat/tta.c index fdc18216c8..26335202c7 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -191,6 +191,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp const FFInputFormat ff_tta_demuxer = { .p.name = "tta", .p.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"), + .p.flags = AVFMT_FLAG_ID3V2_AUTO, .p.extensions = "tta", .priv_data_size = sizeof(TTAContext), .read_probe = tta_probe, diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index c65e0a2723..4c47a5f05c 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -1011,7 +1011,7 @@ static const AVClass w64_demuxer_class = { const FFInputFormat ff_w64_demuxer = { .p.name = "w64", .p.long_name = NULL_IF_CONFIG_SMALL("Sony Wave64"), - .p.flags = AVFMT_GENERIC_INDEX, + .p.flags = AVFMT_GENERIC_INDEX | AVFMT_FLAG_ID3V2_AUTO, .p.codec_tag = ff_wav_codec_tags_list, .p.priv_class = &w64_demuxer_class, .priv_data_size = sizeof(WAVDemuxContext), ----------------------------------------------------------------------- Summary of changes: libavformat/aacdec.c | 2 +- libavformat/avformat.h | 1 + libavformat/demux.c | 9 ++++++--- libavformat/mp3dec.c | 2 +- libavformat/tta.c | 1 + libavformat/wavdec.c | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. cd21fa41c7 avformat/aviobuf: Don't pretend to support avio_context_free(NULL)
by ffmpeg-git＠ffmpeg.org 03 Sep '25

03 Sep '25

The branch, master has been updated via cd21fa41c70bdc03660e0566649e9cf2bd7441b7 (commit) from 66e40840d15b514f275ce3ce2a4bf72ec68c7311 (commit) - Log ----------------------------------------------------------------- commit cd21fa41c70bdc03660e0566649e9cf2bd7441b7 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Sep 3 15:51:51 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Wed Sep 3 15:51:51 2025 +0200 avformat/aviobuf: Don't pretend to support avio_context_free(NULL) It makes no sense to ever call it that way given that avio_context_free() accepts a pointer to a pointer to an AVIOContext. Other double-pointer-free functions like av_freep() also do it that way (and therefore avio_context_free(NULL) still crashes even with 870cfed2317e311a71bc14773332486a162f059c). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 2e65f50006..6a6ec36e28 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -125,8 +125,8 @@ AVIOContext *avio_alloc_context( void avio_context_free(AVIOContext **ps) { - if (ps && *ps) { - AVIOContext *s = *ps; + AVIOContext *s = *ps; + if (s) { av_freep(&s->protocol_whitelist); av_freep(&s->protocol_blacklist); } ----------------------------------------------------------------------- Summary of changes: libavformat/aviobuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0