June 2026 - ffmpeg-devel - lists.ffmpeg.org

[PR] configure: enable ffnvcodec, nvenc, nvdec for aarch64 Windows (PR #23308)
by Diego de Souza 01 Jun '26

01 Jun '26

PR #23308 opened by Diego de Souza (ddesouza) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23308 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23308.patch Adding support to build FFmpeg with HW accelerated decode (nvdec) and encode (nvenc) on aarch64 Windows, covering both the MinGW (mingw32/ mingw64) and MSVC (win32/win64) toolchains. The dynamically-loaded NVIDIA codec headers and the CUDA loader are architecture-agnostic, so the only gate was the target_os check in the aarch64/ppc64 branch. Signed-off-by: Diego de Souza <ddesouza(a)nvidia.com> # Summary of changes Briefly describe what this PR does and why.  From 1051064504cdf101aecd431dd49467693b232bdb Mon Sep 17 00:00:00 2001 From: Diego de Souza <ddesouza(a)nvidia.com> Date: Mon, 1 Jun 2026 17:43:15 +0200 Subject: [PATCH] configure: enable ffnvcodec, nvenc, nvdec for aarch64 Windows Adding support to build FFmpeg with HW accelerated decode (nvdec) and encode (nvenc) on aarch64 Windows, covering both the MinGW (mingw32/ mingw64) and MSVC (win32/win64) toolchains. The dynamically-loaded NVIDIA codec headers and the CUDA loader are architecture-agnostic, so the only gate was the target_os check in the aarch64/ppc64 branch. Signed-off-by: Diego de Souza <ddesouza(a)nvidia.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b0923e4789..c22cbe72f4 100755 --- a/configure +++ b/configure @@ -7886,7 +7886,7 @@ if enabled x86; then esac elif enabled_any aarch64 ppc64 && ! enabled bigendian; then case $target_os in - linux) + linux|mingw32*|mingw64*|win32|win64) ;; *) disable ffnvcodec cuvid nvdec nvenc -- 2.52.0

1 0

[PR] subtitles-shaping-option (PR #23307)
by Jun Zhao 01 Jun '26

01 Jun '26

PR #23307 opened by Jun Zhao (mypopydev) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23307 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23307.patch From 44ed7dd14729cc2a7cb7362ba11acebf0685485a Mon Sep 17 00:00:00 2001 From: Jun Zhao <barryjzhao(a)tencent.com> Date: Fri, 29 May 2026 00:28:16 +0800 Subject: [PATCH 1/2] lavfi/vf_subtitles: expose shaping option The ass filter exposes libass' shaping mode selection so callers can request complex shaping for scripts such as Arabic. The subtitles filter uses the same renderer path but did not expose the option. This left the zero-initialized shaping field to select ASS_SHAPING_SIMPLE implicitly. Expose the same shaping option for subtitles and default it to auto, matching the ass filter. This allows subtitles=...:shaping=complex to render Arabic lam-alef correctly when libass is built with HarfBuzz support. Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com> --- libavfilter/vf_subtitles.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index dde45357ce..9586a904f1 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -76,6 +76,12 @@ typedef struct AssContext { {"fontsdir", "set the directory containing the fonts to read", OFFSET(fontsdir), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, \ {"alpha", "enable processing of alpha channel", OFFSET(alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FLAGS }, \ +#define SHAPING_OPTIONS \ + {"shaping", "set shaping engine", OFFSET(shaping), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, FLAGS, .unit = "shaping_mode"}, \ + {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, \ + {"simple", "simple shaping", 0, AV_OPT_TYPE_CONST, {.i64 = ASS_SHAPING_SIMPLE}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, \ + {"complex", "complex shaping", 0, AV_OPT_TYPE_CONST, {.i64 = ASS_SHAPING_COMPLEX}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, \ + /* libass supports a log level ranging from 0 to 7 */ static const int ass_libavfilter_log_level_map[] = { [0] = AV_LOG_FATAL, /* MSGL_FATAL */ @@ -262,10 +268,7 @@ static const AVFilterPad ass_inputs[] = { static const AVOption ass_options[] = { COMMON_OPTIONS - {"shaping", "set shaping engine", OFFSET(shaping), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, FLAGS, .unit = "shaping_mode"}, - {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, - {"simple", "simple shaping", 0, AV_OPT_TYPE_CONST, {.i64 = ASS_SHAPING_SIMPLE}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, - {"complex", "complex shaping", 0, AV_OPT_TYPE_CONST, {.i64 = ASS_SHAPING_COMPLEX}, INT_MIN, INT_MAX, FLAGS, .unit = "shaping_mode"}, + SHAPING_OPTIONS {NULL}, }; @@ -309,6 +312,7 @@ const FFFilter ff_vf_ass = { static const AVOption subtitles_options[] = { COMMON_OPTIONS + SHAPING_OPTIONS {"charenc", "set input character encoding", OFFSET(charenc), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS}, {"stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, {"si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, -- 2.52.0 From c8de8c2de6d1e5843d1395d597f4cced277131b0 Mon Sep 17 00:00:00 2001 From: Jun Zhao <barryjzhao(a)tencent.com> Date: Mon, 1 Jun 2026 16:28:54 +0800 Subject: [PATCH 2/2] doc/filters: document subtitles filter's shaping option The shaping option is now exposed by both the ass and subtitles filters. Document it under subtitles, update the ass filter description to refer to the shared option set, and note that complex shaping is required for Arabic, Hebrew, Devanagari and Thai and depends on a HarfBuzz-enabled libass build. Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com> --- doc/filters.texi | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 2cae41c7c5..bb55cc70af 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8611,21 +8611,22 @@ Same as the @ref{subtitles} filter, except that it doesn't require libavcodec and libavformat to work. On the other hand, it is limited to ASS (Advanced Substation Alpha) subtitles files. -This filter accepts the following option in addition to the common options from -the @ref{subtitles} filter: +This filter accepts the same options as the @ref{subtitles} filter: @table @option @item shaping -Set the shaping engine +Set the shaping engine. Available values are: @table @samp @item auto The default libass shaping engine, which is the best available. @item simple -Fast, font-agnostic shaper that can do only substitutions +Fast, font-agnostic shaper that can do only substitutions. @item complex -Slower shaper using OpenType for substitutions and positioning +Slower shaper using OpenType for substitutions and positioning. Required +for correct rendering of complex scripts such as Arabic, Hebrew, Devanagari +and Thai. Requires libass to be built with HarfBuzz. @end table The default is @code{auto}. @@ -23351,6 +23352,23 @@ at least libass release 0.17.0 (or LIBASS_VERSION 0x01600010), @emph{and} libass have been built with libunibreak. The option is enabled by default except for native ASS. + +@item shaping +Set the shaping engine. + +Available values are: +@table @samp +@item auto +The default libass shaping engine, which is the best available. +@item simple +Fast, font-agnostic shaper that can do only substitutions. +@item complex +Slower shaper using OpenType for substitutions and positioning. Required +for correct rendering of complex scripts such as Arabic, Hebrew, Devanagari +and Thai. Requires libass to be built with HarfBuzz. +@end table + +The default is @code{auto}. @end table If the first key is not specified, it is assumed that the first value -- 2.52.0

1 0

[PR] [release/7.0] avformat/mov: don't abort on unsupported or invalid chnl boxes (PR #23306)
by James Almer 01 Jun '26

01 Jun '26

PR #23306 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23306 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23306.patch Backport of part of !23264 From f7f5f066cd21cc0641b0335522078e0295d68bde Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Sun, 31 May 2026 13:23:06 -0300 Subject: [PATCH 1/2] avformat/mov_chan: keep the layout untouched on chan/chnl box failure Needed to keep the process going if some issue was found while parsing these boxes. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit fd1c8fa0e611f03681f5fce496848da7c73651a2) --- libavformat/mov_chan.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 3c7274b737..5ba18b62d5 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -312,16 +312,22 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag) /* find the channel layout for the specified layout tag */ layout_map = find_layout_map(tag); if (layout_map) { + AVChannelLayout tmp = { 0 }; int ret; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, channels); + ret = av_channel_layout_custom_init(ch_lay&tmpout, channels); if (ret < 0) return ret; for (i = 0; i < channels; i++) { enum AVChannel id = layout_map[i].id; - ch_layout->u.map[i].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); + tmp.map[i].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); } - return av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + if (ret < 0) + return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } return 0; } @@ -462,6 +468,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; if (layout_tag == MOV_CH_LAYOUT_USE_DESCRIPTIONS) { + AVChannelLayout tmp = { 0 }; int nb_channels = ch_layout->nb_channels; if (!num_descr || num_descr < nb_channels) { @@ -481,8 +488,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, num_descr = nb_channels; } - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) goto out; @@ -499,12 +505,15 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[1] avio_rl32(pb); // mCoordinates[2] size -= 20; - ch_layout->u.map[i].id = mov_get_channel_id(label); + tmp.u.map[i].id = mov_get_channel_id(label); } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) goto out; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else if (layout_tag == MOV_CH_LAYOUT_USE_BITMAP) { if (!ch_layout->nb_channels || av_popcount(bitmap) == ch_layout->nb_channels) { if (bitmap < 0x40000) { @@ -783,11 +792,10 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) av_log(s, AV_LOG_TRACE, "'chnl' layout %d\n", layout); if (!layout) { - AVChannelLayout *ch_layout = &st->codecpar->ch_layout; + AVChannelLayout tmp = { 0 }, *ch_layout = &st->codecpar->ch_layout; int nb_channels = ch_layout->nb_channels; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; @@ -808,12 +816,15 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) channel = AV_CHAN_UNKNOWN; } - ch_layout->u.map[i].id = channel; + tmp.u.map[i].id = channel; } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else { uint64_t omitted_channel_map = avio_rb64(pb); -- 2.52.0 From ff000e900c7c051a36794b760fea22aa7e1cab24 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 28 May 2026 12:05:29 -0300 Subject: [PATCH 2/2] avformat/mov: don't abort on unsupported or invalid chnl boxes They are optional and just define a channel layout, which may also be defined by the underlying codec. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec) --- libavformat/mov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 1dd8bef4e4..31a806b5dc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1178,15 +1178,13 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version != 0 || flags != 0) { - av_log(c->fc, AV_LOG_ERROR, - "Unsupported 'chnl' box with version %d, flags: %#x", + av_log(c->fc, AV_LOG_WARNING, + "Unsupported 'chnl' box with version %d, flags: %#x\n", version, flags); - return AVERROR_INVALIDDATA; + return 0; } - ret = ff_mov_read_chnl(c->fc, pb, st); - if (ret < 0) - return ret; + ff_mov_read_chnl(c->fc, pb, st); if (avio_tell(pb) != end) { av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", -- 2.52.0

1 0

[PR] [release/7.1] avformat/mov: don't abort on unsupported or invalid chnl boxes (PR #23305)
by James Almer 01 Jun '26

01 Jun '26

PR #23305 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23305 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23305.patch Backport of part of !23264 From 06f659b6d7e0f8f66cf01baa544f0173775a1536 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Sun, 31 May 2026 13:23:06 -0300 Subject: [PATCH 1/2] avformat/mov_chan: keep the layout untouched on chan/chnl box failure Needed to keep the process going if some issue was found while parsing these boxes. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit fd1c8fa0e611f03681f5fce496848da7c73651a2) --- libavformat/mov_chan.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4484a22a10..82a4bd07ac 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -375,6 +375,7 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint /* find the channel layout for the specified layout tag */ layout_map = find_layout_map(tag, map); if (layout_map) { + AVChannelLayout tmp = { 0 }; int ret; int map_layout_nb_channels = tag & 0xFFFF; int nb_channels = ch_layout->nb_channels; @@ -383,19 +384,23 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint if (omitted_channel_map >> map_layout_nb_channels) return AVERROR_INVALIDDATA; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; for (int i = 0, idx = 0; i < map_layout_nb_channels && idx < nb_channels; i++, omitted_channel_map >>= 1) { if (!(omitted_channel_map & 1)) { enum AVChannel id = layout_map[i].id; - ch_layout->u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); + tmp.u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); } } - return av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + if (ret < 0) + return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } return 0; } @@ -543,6 +548,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; if (layout_tag == MOV_CH_LAYOUT_USE_DESCRIPTIONS) { + AVChannelLayout tmp = { 0 }; int nb_channels = ch_layout->nb_channels; if (!num_descr || num_descr < nb_channels) { @@ -562,8 +568,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, num_descr = nb_channels; } - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) goto out; @@ -580,12 +585,15 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[1] avio_rl32(pb); // mCoordinates[2] size -= 20; - ch_layout->u.map[i].id = mov_get_channel_id(label); + tmp.u.map[i].id = mov_get_channel_id(label); } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) goto out; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else if (layout_tag == MOV_CH_LAYOUT_USE_BITMAP) { if (!ch_layout->nb_channels || av_popcount(bitmap) == ch_layout->nb_channels) { if (bitmap < 0x40000) { @@ -737,11 +745,10 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) av_log(s, AV_LOG_TRACE, "'chnl' layout %d\n", layout); if (!layout) { - AVChannelLayout *ch_layout = &st->codecpar->ch_layout; + AVChannelLayout tmp = { 0 }, *ch_layout = &st->codecpar->ch_layout; int nb_channels = ch_layout->nb_channels; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; @@ -762,12 +769,15 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) channel = AV_CHAN_UNKNOWN; } - ch_layout->u.map[i].id = channel; + tmp.u.map[i].id = channel; } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else { uint64_t omitted_channel_map = avio_rb64(pb); ret = ff_mov_get_channel_layout_from_config(layout, &st->codecpar->ch_layout, omitted_channel_map); -- 2.52.0 From c06af95f124a118fbbf636a8d4c506588ebfee24 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 28 May 2026 12:05:29 -0300 Subject: [PATCH 2/2] avformat/mov: don't abort on unsupported or invalid chnl boxes They are optional and just define a channel layout, which may also be defined by the underlying codec. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec) --- libavformat/mov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index eb9b4ac6b2..13190819f7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1196,15 +1196,13 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version != 0 || flags != 0) { - av_log(c->fc, AV_LOG_ERROR, - "Unsupported 'chnl' box with version %d, flags: %#x", + av_log(c->fc, AV_LOG_WARNING, + "Unsupported 'chnl' box with version %d, flags: %#x\n", version, flags); - return AVERROR_INVALIDDATA; + return 0; } - ret = ff_mov_read_chnl(c->fc, pb, st); - if (ret < 0) - return ret; + ff_mov_read_chnl(c->fc, pb, st); if (avio_tell(pb) != end) { av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", -- 2.52.0

1 0

[PR] [release/8.0] avformat/mov: don't abort on unsupported or invalid chnl boxes (PR #23304)
by James Almer 01 Jun '26

01 Jun '26

PR #23304 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23304 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23304.patch Backport of part of !23264 From 8e4147264d52a01e3adc55f805ad82b564620488 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Sun, 31 May 2026 13:23:06 -0300 Subject: [PATCH 1/2] avformat/mov_chan: keep the layout untouched on chan/chnl box failure Needed to keep the process going if some issue was found while parsing these boxes. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit fd1c8fa0e611f03681f5fce496848da7c73651a2) --- libavformat/mov_chan.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4484a22a10..82a4bd07ac 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -375,6 +375,7 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint /* find the channel layout for the specified layout tag */ layout_map = find_layout_map(tag, map); if (layout_map) { + AVChannelLayout tmp = { 0 }; int ret; int map_layout_nb_channels = tag & 0xFFFF; int nb_channels = ch_layout->nb_channels; @@ -383,19 +384,23 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint if (omitted_channel_map >> map_layout_nb_channels) return AVERROR_INVALIDDATA; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; for (int i = 0, idx = 0; i < map_layout_nb_channels && idx < nb_channels; i++, omitted_channel_map >>= 1) { if (!(omitted_channel_map & 1)) { enum AVChannel id = layout_map[i].id; - ch_layout->u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); + tmp.u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); } } - return av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + if (ret < 0) + return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } return 0; } @@ -543,6 +548,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; if (layout_tag == MOV_CH_LAYOUT_USE_DESCRIPTIONS) { + AVChannelLayout tmp = { 0 }; int nb_channels = ch_layout->nb_channels; if (!num_descr || num_descr < nb_channels) { @@ -562,8 +568,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, num_descr = nb_channels; } - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) goto out; @@ -580,12 +585,15 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[1] avio_rl32(pb); // mCoordinates[2] size -= 20; - ch_layout->u.map[i].id = mov_get_channel_id(label); + tmp.u.map[i].id = mov_get_channel_id(label); } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) goto out; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else if (layout_tag == MOV_CH_LAYOUT_USE_BITMAP) { if (!ch_layout->nb_channels || av_popcount(bitmap) == ch_layout->nb_channels) { if (bitmap < 0x40000) { @@ -737,11 +745,10 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) av_log(s, AV_LOG_TRACE, "'chnl' layout %d\n", layout); if (!layout) { - AVChannelLayout *ch_layout = &st->codecpar->ch_layout; + AVChannelLayout tmp = { 0 }, *ch_layout = &st->codecpar->ch_layout; int nb_channels = ch_layout->nb_channels; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; @@ -762,12 +769,15 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) channel = AV_CHAN_UNKNOWN; } - ch_layout->u.map[i].id = channel; + tmp.u.map[i].id = channel; } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else { uint64_t omitted_channel_map = avio_rb64(pb); ret = ff_mov_get_channel_layout_from_config(layout, &st->codecpar->ch_layout, omitted_channel_map); -- 2.52.0 From 1e4ea2ec97af5834c8501077a2f49f35ad3989ff Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 28 May 2026 12:05:29 -0300 Subject: [PATCH 2/2] avformat/mov: don't abort on unsupported or invalid chnl boxes They are optional and just define a channel layout, which may also be defined by the underlying codec. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec) --- libavformat/mov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9eb8967c30..12f8e32e59 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1201,15 +1201,13 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version != 0 || flags != 0) { - av_log(c->fc, AV_LOG_ERROR, - "Unsupported 'chnl' box with version %d, flags: %#x", + av_log(c->fc, AV_LOG_WARNING, + "Unsupported 'chnl' box with version %d, flags: %#x\n", version, flags); - return AVERROR_INVALIDDATA; + return 0; } - ret = ff_mov_read_chnl(c->fc, pb, st); - if (ret < 0) - return ret; + ff_mov_read_chnl(c->fc, pb, st); if (avio_tell(pb) != end) { av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", -- 2.52.0

1 0

[PR] [release/8.1] avformat/mov: don't abort on unsupported or invalid chnl boxes (PR #23303)
by James Almer 01 Jun '26

01 Jun '26

PR #23303 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23303 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23303.patch Backport of part of !23264 From 9eb9f4799febf5e5f9b96a44e4189762df38ebe2 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Sun, 31 May 2026 13:23:06 -0300 Subject: [PATCH 1/2] avformat/mov_chan: keep the layout untouched on chan/chnl box failure Needed to keep the process going if some issue was found while parsing these boxes. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit fd1c8fa0e611f03681f5fce496848da7c73651a2) --- libavformat/mov_chan.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 67b22b048d..8e4710fe38 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -375,6 +375,7 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint /* find the channel layout for the specified layout tag */ layout_map = find_layout_map(tag, map); if (layout_map) { + AVChannelLayout tmp = { 0 }; int ret; int map_layout_nb_channels = tag & 0xFFFF; int nb_channels = ch_layout->nb_channels; @@ -383,19 +384,23 @@ static int mov_get_channel_layout(AVChannelLayout *ch_layout, uint32_t tag, uint if (omitted_channel_map >> map_layout_nb_channels) return AVERROR_INVALIDDATA; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; for (int i = 0, idx = 0; i < map_layout_nb_channels && idx < nb_channels; i++, omitted_channel_map >>= 1) { if (!(omitted_channel_map & 1)) { enum AVChannel id = layout_map[i].id; - ch_layout->u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); + tmp.u.map[idx++].id = (id != AV_CHAN_NONE ? id : AV_CHAN_UNKNOWN); } } - return av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + if (ret < 0) + return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } return 0; } @@ -543,6 +548,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; if (layout_tag == MOV_CH_LAYOUT_USE_DESCRIPTIONS) { + AVChannelLayout tmp = { 0 }; int nb_channels = ch_layout->nb_channels; if (!num_descr || num_descr < nb_channels) { @@ -562,8 +568,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, num_descr = nb_channels; } - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) goto out; @@ -580,12 +585,15 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[1] avio_rl32(pb); // mCoordinates[2] size -= 20; - ch_layout->u.map[i].id = mov_get_channel_id(label); + tmp.u.map[i].id = mov_get_channel_id(label); } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) goto out; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else if (layout_tag == MOV_CH_LAYOUT_USE_BITMAP) { if (!ch_layout->nb_channels || av_popcount(bitmap) == ch_layout->nb_channels) { if (bitmap < 0x40000) { @@ -737,11 +745,10 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) av_log(s, AV_LOG_TRACE, "'chnl' layout %d\n", layout); if (!layout) { - AVChannelLayout *ch_layout = &st->codecpar->ch_layout; + AVChannelLayout tmp = { 0 }, *ch_layout = &st->codecpar->ch_layout; int nb_channels = ch_layout->nb_channels; - av_channel_layout_uninit(ch_layout); - ret = av_channel_layout_custom_init(ch_layout, nb_channels); + ret = av_channel_layout_custom_init(&tmp, nb_channels); if (ret < 0) return ret; @@ -762,12 +769,15 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st) channel = AV_CHAN_UNKNOWN; } - ch_layout->u.map[i].id = channel; + tmp.u.map[i].id = channel; } - ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + ret = av_channel_layout_retype(&tmp, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); if (ret < 0) return ret; + + av_channel_layout_uninit(ch_layout); + *ch_layout = tmp; } else { uint64_t omitted_channel_map = avio_rb64(pb); ret = ff_mov_get_channel_layout_from_config(layout, &st->codecpar->ch_layout, omitted_channel_map); -- 2.52.0 From e4c7fbf6c0a922297d4df7288d7aea665af15e24 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Thu, 28 May 2026 12:05:29 -0300 Subject: [PATCH 2/2] avformat/mov: don't abort on unsupported or invalid chnl boxes They are optional and just define a channel layout, which may also be defined by the underlying codec. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 95fe0658d7b3c2e5549ca9a41652ef8c613df8ec) --- libavformat/mov.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 222d79ec1f..d99977de1f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1237,15 +1237,13 @@ static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); flags = avio_rb24(pb); if (version != 0 || flags != 0) { - av_log(c->fc, AV_LOG_ERROR, - "Unsupported 'chnl' box with version %d, flags: %#x", + av_log(c->fc, AV_LOG_WARNING, + "Unsupported 'chnl' box with version %d, flags: %#x\n", version, flags); - return AVERROR_INVALIDDATA; + return 0; } - ret = ff_mov_read_chnl(c->fc, pb, st); - if (ret < 0) - return ret; + ff_mov_read_chnl(c->fc, pb, st); if (avio_tell(pb) != end) { av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", -- 2.52.0

1 0

[PR] fftools/ffmpeg_filter: free input filter channel layout (PR #23302)
by Zhao Zhili 01 Jun '26

01 Jun '26

PR #23302 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23302 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23302.patch Fixes the LeakSanitizer failure in fate-dca-xll-coded. It was exposed by c65c8f1f4958. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> From 724ca2dbea12529b07ddb04d021d52c03242ec0e Mon Sep 17 00:00:00 2001 From: Zhao Zhili <zhilizhao(a)tencent.com> Date: Mon, 1 Jun 2026 21:06:47 +0800 Subject: [PATCH] fftools/ffmpeg_filter: free input filter channel layout Fixes the LeakSanitizer failure in fate-dca-xll-coded. It was exposed by c65c8f1f4958. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> --- fftools/ffmpeg_filter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 2a8de34d29..8ea89e2ec2 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1037,6 +1037,7 @@ void fg_free(FilterGraph **pfg) av_frame_free(&ifp->opts.fallback); av_buffer_unref(&ifp->hw_frames_ctx); + av_channel_layout_uninit(&ifp->ch_layout); av_freep(&ifilter->linklabel); av_freep(&ifp->opts.name); av_frame_side_data_free(&ifp->side_data, &ifp->nb_side_data); -- 2.52.0

1 0

[PR] avformat/mxfdec: zero-init Sony MPEG-4 extradata and add padding (PR #23194)
by michaelni 01 Jun '26

01 Jun '26

PR #23194 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23194 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23194.patch Found-by: Calm (AI security-research agent, for John Bradley / Credex) From c2ea987aa09032ab496da581858d844bb2ad6071 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Thu, 21 May 2026 06:28:15 +0200 Subject: [PATCH] avformat/mxfdec: zero-init Sony MPEG-4 extradata and add padding Found-by: Calm (AI security-research agent, for John Bradley / Credex) --- libavformat/mxfdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index a5a8417487..58ea0bbca5 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1438,12 +1438,12 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int break; default: /* Private uid used by SONY C0023S01.mxf */ - if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) { + if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata) && size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { if (descriptor->extradata) av_log(NULL, AV_LOG_WARNING, "Duplicate sony_mpeg4_extradata\n"); av_free(descriptor->extradata); descriptor->extradata_size = 0; - descriptor->extradata = av_malloc(size); + descriptor->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!descriptor->extradata) return AVERROR(ENOMEM); descriptor->extradata_size = size; -- 2.52.0

3 3

[PR] avformat/mxfdec: Remove unneeded check (PR #23269)
by michaelni 01 Jun '26

01 Jun '26

PR #23269 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23269 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23269.patch size is 16bit only Found-by: Tomas Härdin Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From f13b3720219f0ea0140faa4e6cfb61a2a0d8722f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 29 May 2026 04:57:55 +0200 Subject: [PATCH] avformat/mxfdec: Remove unneeded check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit size is 16bit only Found-by: Tomas Härdin Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 58ea0bbca5..4ba4af1fa7 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1438,7 +1438,7 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int break; default: /* Private uid used by SONY C0023S01.mxf */ - if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata) && size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) { if (descriptor->extradata) av_log(NULL, AV_LOG_WARNING, "Duplicate sony_mpeg4_extradata\n"); av_free(descriptor->extradata); -- 2.52.0

2 1

[PR] propagate max_pixels (PR #23301)
by michaelni 01 Jun '26

01 Jun '26

PR #23301 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23301 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23301.patch From b1f706e4d16387b5ea686ecf04a2896df277bac5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Sun, 31 May 2026 20:17:16 +0200 Subject: [PATCH 1/3] avcodec/cri: propagate max_pixels to the JPEG tile decoder Fixes: 489941776/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-4845035614175232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/cri.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/cri.c b/libavcodec/cri.c index f380597238..72f1eff9d8 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -69,6 +69,7 @@ static av_cold int cri_decode_init(AVCodecContext *avctx) s->jpeg_avctx->flags = avctx->flags; s->jpeg_avctx->flags2 = avctx->flags2; s->jpeg_avctx->idct_algo = avctx->idct_algo; + s->jpeg_avctx->max_pixels = avctx->max_pixels; ret = avcodec_open2(s->jpeg_avctx, NULL, NULL); if (ret < 0) return ret; -- 2.52.0 From 19946f4c1d1050d1e483c0e09dddfa4501651509 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Sun, 31 May 2026 20:21:47 +0200 Subject: [PATCH 2/3] avcodec/imm5: propagate max_pixels to the H264/HEVC sub-decoders Fixes: 501794495/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IMM5_fuzzer-5192457796255744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/imm5.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/imm5.c b/libavcodec/imm5.c index b1cda453c9..d130db76ae 100644 --- a/libavcodec/imm5.c +++ b/libavcodec/imm5.c @@ -62,6 +62,7 @@ static av_cold int imm5_init(AVCodecContext *avctx) ctx->h264_avctx->thread_count = 1; ctx->h264_avctx->flags = avctx->flags; ctx->h264_avctx->flags2 = avctx->flags2; + ctx->h264_avctx->max_pixels = avctx->max_pixels; ret = avcodec_open2(ctx->h264_avctx, NULL, NULL); if (ret < 0) return ret; @@ -73,6 +74,7 @@ static av_cold int imm5_init(AVCodecContext *avctx) ctx->hevc_avctx->thread_count = 1; ctx->hevc_avctx->flags = avctx->flags; ctx->hevc_avctx->flags2 = avctx->flags2; + ctx->hevc_avctx->max_pixels = avctx->max_pixels; ret = avcodec_open2(ctx->hevc_avctx, NULL, NULL); if (ret < 0) return ret; -- 2.52.0 From eb2692f6c69bb408c9ec7e865baad562b7a40b77 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Sun, 31 May 2026 21:26:52 +0200 Subject: [PATCH 3/3] avcodec/tdsc: propagate max_pixels to the JPEG tile decoder Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/tdsc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 91ea17df76..e8d37a4e3f 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -127,6 +127,7 @@ static av_cold int tdsc_init(AVCodecContext *avctx) ctx->jpeg_avctx->flags = avctx->flags; ctx->jpeg_avctx->flags2 = avctx->flags2; ctx->jpeg_avctx->idct_algo = avctx->idct_algo; + ctx->jpeg_avctx->max_pixels = avctx->max_pixels; ret = avcodec_open2(ctx->jpeg_avctx, NULL, NULL); if (ret < 0) return ret; -- 2.52.0

1 0