June 2026 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] avcodec/x86/hevc/add_res: Port ff_hevc_add_residual_4_8_mmxext to SSE2 (branch master)
by Andreas Rheinhardt 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new f0bfebc9ad avcodec/x86/hevc/add_res: Port ff_hevc_add_residual_4_8_mmxext to SSE2 f0bfebc9ad is described below commit f0bfebc9adce90d7c3d44f1a081a705389995b34 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Fri Jun 26 19:42:44 2026 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Tue Jun 30 22:50:17 2026 +0200 avcodec/x86/hevc/add_res: Port ff_hevc_add_residual_4_8_mmxext to SSE2 No change in performance here. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/x86/hevc/add_res.asm | 17 ++++++++--------- libavcodec/x86/hevc/dsp.h | 2 +- libavcodec/x86/hevc/dsp_init.c | 5 ++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavcodec/x86/hevc/add_res.asm b/libavcodec/x86/hevc/add_res.asm index 3489e04e2b..70ae9fbc76 100644 --- a/libavcodec/x86/hevc/add_res.asm +++ b/libavcodec/x86/hevc/add_res.asm @@ -27,9 +27,9 @@ cextern pw_1023 %define max_pixels_10 pw_1023 ; the add_res macros and functions were largely inspired by h264_idct.asm from the x264 project -%macro ADD_RES_MMX_4_8 1 - mova m0, [r1+%1] - mova m2, [r1+%1+8] +%macro ADD_RES_4_8 1 + movq m0, [r1+%1] + movq m2, [r1+%1+8] movd m1, [r0] movd m3, [r0+r2] @@ -45,14 +45,13 @@ cextern pw_1023 movd [r0+r2], m2 %endmacro - -INIT_MMX mmxext -; void ff_hevc_add_residual_4_8_mmxext(uint8_t *dst, const int16_t *res, ptrdiff_t stride) -cglobal hevc_add_residual_4_8, 3, 3, 6 +INIT_XMM sse2 +; void ff_hevc_add_residual_4_8_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t stride) +cglobal hevc_add_residual_4_8, 3, 3, 5 pxor m4, m4 - ADD_RES_MMX_4_8 0 + ADD_RES_4_8 0 lea r0, [r0+r2*2] - ADD_RES_MMX_4_8 16 + ADD_RES_4_8 16 RET %macro ADD_RES_SSE_8_8 1 diff --git a/libavcodec/x86/hevc/dsp.h b/libavcodec/x86/hevc/dsp.h index 69d3987cdb..98dc8cff9a 100644 --- a/libavcodec/x86/hevc/dsp.h +++ b/libavcodec/x86/hevc/dsp.h @@ -167,7 +167,7 @@ void ff_hevc_put_qpel_hv8_8_avx512icl(int16_t *dst, const uint8_t *_src, ptrdiff // TRANSFORM_ADD /////////////////////////////////////////////////////////////////////////////// -void ff_hevc_add_residual_4_8_mmxext(uint8_t *dst, const int16_t *res, ptrdiff_t stride); +void ff_hevc_add_residual_4_8_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t stride); void ff_hevc_add_residual_8_8_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t stride); void ff_hevc_add_residual_16_8_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t stride); void ff_hevc_add_residual_32_8_sse2(uint8_t *dst, const int16_t *res, ptrdiff_t stride); diff --git a/libavcodec/x86/hevc/dsp_init.c b/libavcodec/x86/hevc/dsp_init.c index ca3962b3f2..00f24aed41 100644 --- a/libavcodec/x86/hevc/dsp_init.c +++ b/libavcodec/x86/hevc/dsp_init.c @@ -817,10 +817,9 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) int cpu_flags = av_get_cpu_flags(); if (bit_depth == 8) { - if (EXTERNAL_MMXEXT(cpu_flags)) { - c->add_residual[0] = ff_hevc_add_residual_4_8_mmxext; - } if (EXTERNAL_SSE2(cpu_flags)) { + c->add_residual[0] = ff_hevc_add_residual_4_8_sse2; + c->hevc_v_loop_filter_chroma = ff_hevc_v_loop_filter_chroma_8_sse2; c->hevc_h_loop_filter_chroma = ff_hevc_h_loop_filter_chroma_8_sse2; #if ARCH_X86_64

1 0

[ffmpeg] avformat/movenc: free sgpd_entries on the roll-distance error path (branch master)
by Michael Niedermayer 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new b553b810c4 avformat/movenc: free sgpd_entries on the roll-distance error path b553b810c4 is described below commit b553b810c460e484f70a7368ed7abbdcecbe845b Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Jun 29 01:35:05 2026 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Tue Jun 30 17:29:51 2026 +0000 avformat/movenc: free sgpd_entries on the roll-distance error path Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/movenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 536b16a152..b1ec603eb6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3364,8 +3364,10 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) if (roll_samples_remaining > 0) distance = 0; /* Verify distance is a maximum of 32 (2.5ms) packets. */ - if (distance > 32) + if (distance > 32) { + av_freep(&sgpd_entries); return AVERROR_INVALIDDATA; + } if (i && distance == sgpd_entries[entries].roll_distance) { sgpd_entries[entries].count++; } else {

1 0

[ffmpeg] avfilter/vf_removelogo: free the whole mask on allocation failure (branch master)
by Michael Niedermayer 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 9a01c1cb6a avfilter/vf_removelogo: free the whole mask on allocation failure 9a01c1cb6a is described below commit 9a01c1cb6a4cf87529fe9898b66ec55c5b032639 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Jun 29 01:35:05 2026 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Tue Jun 30 11:15:33 2026 +0000 avfilter/vf_removelogo: free the whole mask on allocation failure Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/vf_removelogo.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index 1da5f5d0c7..7285f5336a 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -311,22 +311,18 @@ static av_cold int init(AVFilterContext *ctx) the filter is applied, the mask size is determined on a pixel by pixel basis, with pixels nearer the edge of the logo getting smaller mask sizes. */ - mask = (int ***)av_malloc_array(s->max_mask_size + 1, sizeof(int **)); + mask = av_calloc(s->max_mask_size + 1, sizeof(*mask)); if (!mask) return AVERROR(ENOMEM); for (a = 0; a <= s->max_mask_size; a++) { - mask[a] = (int **)av_malloc_array((a * 2) + 1, sizeof(int *)); - if (!mask[a]) { - av_free(mask); - return AVERROR(ENOMEM); - } + mask[a] = av_calloc((a * 2) + 1, sizeof(*mask[a])); + if (!mask[a]) + goto mask_fail; for (b = -a; b <= a; b++) { - mask[a][b + a] = (int *)av_malloc_array((a * 2) + 1, sizeof(int)); - if (!mask[a][b + a]) { - av_free(mask); - return AVERROR(ENOMEM); - } + mask[a][b + a] = av_malloc_array((a * 2) + 1, sizeof(*mask[a][b + a])); + if (!mask[a][b + a]) + goto mask_fail; for (c = -a; c <= a; c++) { if ((b * b) + (c * c) <= (a * a)) /* Circular 0/1 mask. */ mask[a][b + a][c + a] = 1; @@ -351,6 +347,16 @@ static av_cold int init(AVFilterContext *ctx) SHOW_LOGO_INFO(half); return 0; + +mask_fail: + for (a = 0; a <= s->max_mask_size; a++) { + if (mask[a]) + for (b = 0; b < (a * 2) + 1; b++) + av_free(mask[a][b]); + av_free(mask[a]); + } + av_free(mask); + return AVERROR(ENOMEM); } static int config_props_input(AVFilterLink *inlink)

1 0

[ffmpeg] avfilter/af_adeclick: free transform contexts and buffers on error (branch master)
by Michael Niedermayer 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 59a5090070 avfilter/af_adeclick: free transform contexts and buffers on error 59a5090070 is described below commit 59a5090070d094029cc328f6160b87a9f214c01d Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Jun 29 01:35:05 2026 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Tue Jun 30 11:05:29 2026 +0000 avfilter/af_adeclick: free transform contexts and buffers on error Found-by: Ao Xijie Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/af_adeclick.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index 043435b186..198e7fab63 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -130,8 +130,8 @@ static int config_input(AVFilterLink *inlink) return AVERROR(ENOMEM); { - double *tx_in[2], *tx_out[2]; - AVTXContext *tx, *itx; + double *tx_in[2] = { NULL }, *tx_out[2] = { NULL }; + AVTXContext *tx = NULL, *itx = NULL; av_tx_fn tx_fn, itx_fn; int ret, tx_size; double scale; @@ -141,19 +141,21 @@ static int config_input(AVFilterLink *inlink) scale = 1.0; ret = av_tx_init(&tx, &tx_fn, AV_TX_DOUBLE_RDFT, 0, tx_size, &scale, 0); if (ret < 0) - return ret; + goto tx_end; scale = 1.0 / tx_size; ret = av_tx_init(&itx, &itx_fn, AV_TX_DOUBLE_RDFT, 1, tx_size, &scale, 0); if (ret < 0) - return ret; + goto tx_end; tx_in[0] = av_calloc(tx_size + 2, sizeof(*tx_in[0])); tx_in[1] = av_calloc(tx_size + 2, sizeof(*tx_in[1])); tx_out[0] = av_calloc(tx_size + 2, sizeof(*tx_out[0])); tx_out[1] = av_calloc(tx_size + 2, sizeof(*tx_out[1])); - if (!tx_in[0] || !tx_in[1] || !tx_out[0] || !tx_out[1]) - return AVERROR(ENOMEM); + if (!tx_in[0] || !tx_in[1] || !tx_out[0] || !tx_out[1]) { + ret = AVERROR(ENOMEM); + goto tx_end; + } for (int n = 0; n < s->window_size - s->hop_size; n++) tx_in[0][n] = 1.0; @@ -180,6 +182,7 @@ static int config_input(AVFilterLink *inlink) for (int n = 0; n < s->window_size; n++) s->window_func_lut[n] = tx_out[0][n] * scale; +tx_end: av_tx_uninit(&tx); av_tx_uninit(&itx); @@ -187,6 +190,9 @@ static int config_input(AVFilterLink *inlink) av_freep(&tx_in[1]); av_freep(&tx_out[0]); av_freep(&tx_out[1]); + + if (ret < 0) + return ret; } av_frame_free(&s->in);

1 0

[ffmpeg] tests: Implicitly set TAG=GEN for data/*.m3u8 (branch master)
by Martin Storsjö 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new ae4314e2f4 tests: Implicitly set TAG=GEN for data/*.m3u8 ae4314e2f4 is described below commit ae4314e2f4618b8b4d36864fdacc03ea0e85a1f6 Author: Martin Storsjö <martin(a)martin.st> AuthorDate: Mon Jun 29 10:44:22 2026 +0300 Commit: Martin Storsjö <martin(a)martin.st> CommitDate: Tue Jun 30 08:23:04 2026 +0000 tests: Implicitly set TAG=GEN for data/*.m3u8 This avoids having to declare it for every rule that generates test input data, and adds such a missing tag for tests/data/hls-seek.m3u8. This fixes a case of a missing TAG for data/hls-seek.m3u8, which caused it to be printed without a tag, like " tests/data/hls-seek.m3u8", now printed as "GEN tests/data/hls-seek.m3u8" as expected. --- tests/Makefile | 2 +- tests/fate/filter-audio.mak | 2 -- tests/fate/hlsenc.mak | 19 ------------------- tests/fate/segment.mak | 2 -- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 8c7d4539a3..3f0132dd97 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -51,7 +51,7 @@ tests/test_copy.ffmeta: TAG = COPY tests/test_copy.ffmeta: tests/data $(M)cp -f $(SRC_PATH)/tests/test.ffmeta tests/test_copy.ffmeta -tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut tests/data/%.m3u8: TAG = GEN tests/data/filtergraphs/%: TAG = COPY tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 526645a634..7817548037 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -214,7 +214,6 @@ fate-filter-compand: tests/data/filtergraphs/compand fate-filter-compand: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-compand: CMD = framecrc -auto_conversion_filters -i $(SRC) -frames:a 20 -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/compand -tests/data/hls-list.m3u8: TAG = GEN tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ @@ -224,7 +223,6 @@ FATE_AFILTER-$(call FILTERDEMDECENCMUX, ARESAMPLE AEVALSRC, HLS MPEGTS, MP2 PCM_ fate-filter-hls: tests/data/hls-list.m3u8 fate-filter-hls: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list.m3u8 -af aresample -tests/data/hls-list-append.m3u8: TAG = GEN tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index cd6cd60365..1ddb927cae 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -1,4 +1,3 @@ -tests/data/live_no_endlist.m3u8: TAG = GEN tests/data/live_no_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -12,7 +11,6 @@ fate-hls-live-no-endlist: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -t 6 fate-hls-live-no-endlist: CMP = oneline fate-hls-live-no-endlist: REF = e038bb8e65d4c1745b9b3ed643e607a3 -tests/data/event_no_endlist.m3u8: TAG = GEN tests/data/event_no_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -27,7 +25,6 @@ fate-hls-event-no-endlist: CMD = md5 -ss 3 -i $(SRC) -af hdcd=process_stereo=fal fate-hls-event-no-endlist: CMP = oneline fate-hls-event-no-endlist: REF = d9cd56b6aaebf67a52a63dd44ec5b085 -tests/data/live_last_endlist.m3u8: TAG = GEN tests/data/live_last_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -v verbose -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -42,7 +39,6 @@ fate-hls-live-last-endlist: CMP = oneline fate-hls-live-last-endlist: REF = 2ca8567092dcf01e37bedd50454d1ab7 -tests/data/live_endlist.m3u8: TAG = GEN tests/data/live_endlist.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 3 -map 0 \ @@ -56,7 +52,6 @@ fate-hls-live-endlist: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -t 20 - fate-hls-live-endlist: CMP = oneline fate-hls-live-endlist: REF = e189ce781d9c87882f58e3929455167b -tests/data/hls_segment_size.m3u8: TAG = GEN tests/data/hls_segment_size.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_segment_size 300000 -map 0 \ @@ -67,7 +62,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-segment-size: tests/data/hls_segment_size.m3u8 fate-hls-segment-size: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_segment_size.m3u8 -vf setpts=N*23 -tests/data/hls_segment_single.m3u8: TAG = GEN tests/data/hls_segment_single.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_flags single_file -map 0 \ @@ -78,7 +72,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-segment-single: tests/data/hls_segment_single.m3u8 fate-hls-segment-single: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_segment_single.m3u8 -vf setpts=N*23 -tests/data/hls_init_time.m3u8: TAG = GEN tests/data/hls_init_time.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=11" -f hls -hls_init_time 1 -hls_time 3 -map 0 \ @@ -89,7 +82,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-init-time: tests/data/hls_init_time.m3u8 fate-hls-init-time: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_init_time.m3u8 -vf setpts=N*23 -tests/data/hls_list_size.m3u8: TAG = GEN tests/data/hls_list_size.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 4 -map 0 \ @@ -100,7 +92,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-list-size: tests/data/hls_list_size.m3u8 fate-hls-list-size: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_list_size.m3u8 -vf setpts=N*23 -tests/data/hls_fmp4.m3u8: TAG = GEN tests/data/hls_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -re -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=5" -map 0 -codec:a mp2fixed \ @@ -112,7 +103,6 @@ FATE_HLSENC-$(call FILTERDEMDECENCMUX, AEVALSRC ARESAMPLE, HLS MPEGTS, MP2 PCM_F fate-hls-fmp4: tests/data/hls_fmp4.m3u8 fate-hls-fmp4: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_fmp4.m3u8 -vf setpts=N*23 -tests/data/hls_fmp4_ac3.m3u8: TAG = GEN tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -stream_loop 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ @@ -127,7 +117,6 @@ fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8 fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4 -tests/data/hls_cmfa.m3u8: TAG = GEN tests/data/hls_cmfa.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/aac/al06_44.mp4 -c copy -map 0 \ @@ -146,7 +135,6 @@ FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HLSENC_PROBE-yes) # -- Tests below do not require FATE samples (lavfi-generated input only) -- -tests/data/hls_playlist_type_vod.m3u8: TAG = GEN tests/data/hls_playlist_type_vod.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -159,7 +147,6 @@ fate-hls-playlist-type-vod: tests/data/hls_playlist_type_vod.m3u8 fate-hls-playlist-type-vod: CMD = sed -n -e /^\#EXT-X-PLAYLIST-TYPE:/p -e /^\#EXT-X-ENDLIST/p $(TARGET_PATH)/tests/data/hls_playlist_type_vod.m3u8 fate-hls-playlist-type-vod: CMP = diff -tests/data/hls_playlist_type_event.m3u8: TAG = GEN tests/data/hls_playlist_type_event.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -172,7 +159,6 @@ fate-hls-playlist-type-event: tests/data/hls_playlist_type_event.m3u8 fate-hls-playlist-type-event: CMD = sed -n -e /^\#EXT-X-PLAYLIST-TYPE:/p -e /^\#EXT-X-ENDLIST/p $(TARGET_PATH)/tests/data/hls_playlist_type_event.m3u8 fate-hls-playlist-type-event: CMP = diff -tests/data/hls_round_durations.m3u8: TAG = GEN tests/data/hls_round_durations.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -185,7 +171,6 @@ fate-hls-round-durations: tests/data/hls_round_durations.m3u8 fate-hls-round-durations: CMD = sed -n -e /^\#EXTINF:/p $(TARGET_PATH)/tests/data/hls_round_durations.m3u8 fate-hls-round-durations: CMP = diff -tests/data/hls_discont_start.m3u8: TAG = GEN tests/data/hls_discont_start.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -198,7 +183,6 @@ fate-hls-discont-start: tests/data/hls_discont_start.m3u8 fate-hls-discont-start: CMD = sed -n -e /^\#EXT-X-DISCONTINUITY/p -e /^\#EXTINF:/p -e /^[^\#]/p $(TARGET_PATH)/tests/data/hls_discont_start.m3u8 fate-hls-discont-start: CMP = diff -tests/data/hls_independent_segments.m3u8: TAG = GEN tests/data/hls_independent_segments.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -211,7 +195,6 @@ fate-hls-independent-segments: tests/data/hls_independent_segments.m3u8 fate-hls-independent-segments: CMD = sed -n -e /^\#EXT-X-INDEPENDENT-SEGMENTS/p $(TARGET_PATH)/tests/data/hls_independent_segments.m3u8 fate-hls-independent-segments: CMP = diff -tests/data/hls_start_number.m3u8: TAG = GEN tests/data/hls_start_number.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -224,7 +207,6 @@ fate-hls-start-number: tests/data/hls_start_number.m3u8 fate-hls-start-number: CMD = sed -n -e /^\#EXT-X-MEDIA-SEQUENCE:/p -e /^[^\#]/p $(TARGET_PATH)/tests/data/hls_start_number.m3u8 fate-hls-start-number: CMP = diff -tests/data/hls_iframes_single_mpegts.m3u8: TAG = GEN tests/data/hls_iframes_single_mpegts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ @@ -238,7 +220,6 @@ fate-hls-iframes-single-mpegts: tests/data/hls_iframes_single_mpegts.m3u8 fate-hls-iframes-single-mpegts: CMD = sed -n -e /^\#EXT-X-BYTERANGE:/p $(TARGET_PATH)/tests/data/hls_iframes_single_mpegts.m3u8 fate-hls-iframes-single-mpegts: CMP = diff -tests/data/hls_iframes_single_fmp4.m3u8: TAG = GEN tests/data/hls_iframes_single_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -f lavfi -i "testsrc2=size=128x72:rate=1:d=3" -f hls -hls_time 1 -map 0:v \ diff --git a/tests/fate/segment.mak b/tests/fate/segment.mak index 8537462762..5803fffb98 100644 --- a/tests/fate/segment.mak +++ b/tests/fate/segment.mak @@ -1,11 +1,9 @@ -tests/data/mp4-to-ts.m3u8: TAG = GEN tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 \ -f ssegment -segment_time 1 -map 0 -flags +bitexact -codec copy \ -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/mp4-to-ts-%03d.ts 2>/dev/null -tests/data/adts-to-mkv.m3u8: TAG = GEN tests/data/adts-to-mkv.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \

1 0

[ffmpeg] avformat: add iTerm2 inline image protocol muxer (branch master)
by Zhao Zhili 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 0a44e7ddc1 avformat: add iTerm2 inline image protocol muxer 0a44e7ddc1 is described below commit 0a44e7ddc18d6ec58b23cad7b56f2ca0217f8768 Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Fri Jun 19 21:34:06 2026 +0800 Commit: Zhao Zhili <quink(a)noreply.code.ffmpeg.org> CommitDate: Tue Jun 30 05:08:44 2026 +0000 avformat: add iTerm2 inline image protocol muxer Add a muxer that wraps encoded image in the iTerm2 inline image protocol (OSC 1337) so ffmpeg can play video directly in an iTerm2 terminal. The output is a self-contained byte stream: it can be played live or saved to a file and replayed with cat. --- Changelog | 1 + doc/muxers.texi | 52 ++++++++++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/iterm2enc.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 236 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 3268ab2cca..b7ff2ac602 100644 --- a/Changelog +++ b/Changelog @@ -22,6 +22,7 @@ version 9.0: - Add AMF hardware memory mapping support. - ONNX Runtime DNN backend with GPU execution provider support - Remove deprecated NVENC options and support for pre-11.1 SDK versions +- iTerm2 inline image protocol muxer version 8.1: diff --git a/doc/muxers.texi b/doc/muxers.texi index 9a579ebebf..92d707ad9f 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2722,6 +2722,58 @@ computer-generated compositions. This muxer accepts a single audio stream containing PCM data. +@section iterm2 +iTerm2 inline image protocol muxer. + +This muxer writes video frames as OSC 1337 inline images for display in +terminals that support the iTerm2 image protocol. Use @option{-re} to limit +the output rate to the source framerate; without it, frames are emitted as +fast as they are encoded, which is usually not desired for live display. + +Frames are sent with the multipart form of the protocol, which splits each +image across several short control sequences. This avoids the per-sequence +size limit that otherwise discards large frames, and requires iTerm2 3.5 or +newer. + +The output is a self-contained byte stream and can be redirected to a file. +Replaying the file with @command{cat} displays the images in the terminal. + +@subsection Options +@table @option +@item display_width @var{size} +Set the displayed image width. @var{size} can be @samp{auto}, @var{N} terminal +cells, @var{N}px pixels, or @var{N}% of the terminal width. When unset, the +terminal derives the width from the image. + +@item display_height @var{size} +Set the displayed image height. @var{size} uses the same syntax as +@option{display_width}. When unset, the terminal derives the height from the +image. + +@item keep_aspect @var{bool} +Preserve the input aspect ratio when scaling. Default is enabled. + +@item tmux @var{bool} +Wrap image data in tmux DCS passthrough. This requires a tmux version whose +passthrough sequence size limit is large enough for image data, with +passthrough enabled via @command{tmux set -g allow-passthrough on}. Default is +disabled. +@end table + +@subsection Examples + +Display a video in an iTerm2 terminal: +@example +ffmpeg -re -i input.mp4 -f iterm2 - +@end example + +Scale the displayed image to 40 terminal cells tall. Inside tmux, enable +passthrough first with @command{tmux set -g allow-passthrough on}, then add +@option{tmux}: +@example +ffmpeg -re -i input.mp4 -f iterm2 -display_height 40 -tmux 1 - +@end example + @section ivf On2 IVF muxer. diff --git a/libavformat/Makefile b/libavformat/Makefile index 752436cf5f..b244eaabf9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -338,6 +338,7 @@ OBJS-$(CONFIG_IPU_DEMUXER) += ipudec.o rawdec.o OBJS-$(CONFIG_IRCAM_DEMUXER) += ircamdec.o ircam.o pcm.o OBJS-$(CONFIG_IRCAM_MUXER) += ircamenc.o ircam.o rawenc.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o +OBJS-$(CONFIG_ITERM2_MUXER) += iterm2enc.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index af7eea5e5c..05624e66eb 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -242,6 +242,7 @@ extern const FFInputFormat ff_ircam_demuxer; extern const FFOutputFormat ff_ircam_muxer; extern const FFOutputFormat ff_ismv_muxer; extern const FFInputFormat ff_iss_demuxer; +extern const FFOutputFormat ff_iterm2_muxer; extern const FFInputFormat ff_iv8_demuxer; extern const FFInputFormat ff_ivf_demuxer; extern const FFOutputFormat ff_ivf_muxer; diff --git a/libavformat/iterm2enc.c b/libavformat/iterm2enc.c new file mode 100644 index 0000000000..5503b08266 --- /dev/null +++ b/libavformat/iterm2enc.c @@ -0,0 +1,180 @@ +/* + * This file is part of FFmpeg. + * + * Copyright (c) 2026 Zhao Zhili <quinkblack(a)foxmail.com> + * + * 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 <string.h> + +#include "libavutil/base64.h" +#include "libavutil/macros.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" +#include "avformat.h" +#include "mux.h" + +/* iTerm2 inline image protocol: https://iterm2.com/documentation-images.html */ + +#define ESC "\033" + +#define SYNC_BEGIN ESC "[?2026h" +#define SYNC_END ESC "[?2026l" +#define CURSOR_SAVE ESC "7" +#define CURSOR_RESTORE ESC "8" +#define CURSOR_HOME ESC "[H" +#define CURSOR_BOTTOM ESC "[999H" + +#define OSC_START ESC "]1337;" +#define BEL "\a" +#define ST ESC "\\" + +/* tmux requires DCS passthrough with ST termination and ESC doubling */ +#define TMUX_DCS ESC "Ptmux;" + +/* iTerm2 and tmux silently drop a single OSC sequence >= 1 MiB, so split the + * image into chunks below that limit. Old tmux capped a sequence at 256 bytes, + * but the tiny chunks that would require flood the tmux parser and freeze the + * terminal, so we do not support such versions. */ +#define FILEPART_CHUNK ((1 << 20) - 4096) + +#define WRITE_LITERAL(pb, str) avio_write(pb, (const unsigned char *)(str), \ + sizeof(str) - 1) + +typedef struct ITerm2Context { + const AVClass *class; + char *display_width; + char *display_height; + int keep_aspect; + int tmux; + char *b64; + unsigned b64_size; +} ITerm2Context; + +static void osc_open(ITerm2Context *c, AVIOContext *pb) +{ + if (c->tmux) + WRITE_LITERAL(pb, TMUX_DCS ESC); + WRITE_LITERAL(pb, OSC_START); +} + +static void osc_close(ITerm2Context *c, AVIOContext *pb) +{ + WRITE_LITERAL(pb, BEL); + if (c->tmux) + WRITE_LITERAL(pb, ST); +} + +static void write_image(ITerm2Context *c, AVIOContext *pb, int size) +{ + size_t b64_len = strlen(c->b64); + + osc_open(c, pb); + WRITE_LITERAL(pb, "MultipartFile="); + avio_printf(pb, "inline=1;size=%d", size); + if (c->display_width && c->display_width[0]) + avio_printf(pb, ";width=%s", c->display_width); + if (c->display_height && c->display_height[0]) + avio_printf(pb, ";height=%s", c->display_height); + if (!c->keep_aspect) + WRITE_LITERAL(pb, ";preserveAspectRatio=0"); + osc_close(c, pb); + + for (size_t off = 0; off < b64_len; off += FILEPART_CHUNK) { + size_t n = FFMIN(FILEPART_CHUNK, b64_len - off); + + osc_open(c, pb); + WRITE_LITERAL(pb, "FilePart="); + avio_write(pb, c->b64 + off, n); + osc_close(c, pb); + } + + osc_open(c, pb); + WRITE_LITERAL(pb, "FileEnd"); + osc_close(c, pb); +} + +static int iterm2_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + ITerm2Context *c = s->priv_data; + + av_fast_malloc(&c->b64, &c->b64_size, AV_BASE64_SIZE(pkt->size)); + if (!c->b64) + return AVERROR(ENOMEM); + if (!av_base64_encode(c->b64, c->b64_size, pkt->data, pkt->size)) + return AVERROR(EINVAL); + + /* Synchronized output swaps the frame in atomically. */ + WRITE_LITERAL(s->pb, SYNC_BEGIN CURSOR_SAVE CURSOR_HOME); + + write_image(c, s->pb, pkt->size); + + WRITE_LITERAL(s->pb, CURSOR_RESTORE SYNC_END); + + avio_flush(s->pb); + + return 0; +} + +static int iterm2_write_trailer(AVFormatContext *s) +{ + WRITE_LITERAL(s->pb, CURSOR_BOTTOM "\n"); + + return 0; +} + +static av_cold void iterm2_deinit(AVFormatContext *s) +{ + ITerm2Context *c = s->priv_data; + av_freep(&c->b64); +} + +#define OFFSET(x) offsetof(ITerm2Context, x) +#define ENC AV_OPT_FLAG_ENCODING_PARAM + +static const AVOption options[] = { + { "display_width", "on-screen width (auto, N cells, Npx, N%%)", + OFFSET(display_width), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, ENC }, + { "display_height", "on-screen height (auto, N cells, Npx, N%%)", + OFFSET(display_height), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, ENC }, + { "keep_aspect", "preserve aspect ratio when scaling", + OFFSET(keep_aspect), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC }, + { "tmux", "wrap image in tmux DCS passthrough, requires tmux set -g allow-passthrough on", + OFFSET(tmux), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, + { NULL }, +}; + +static const AVClass iterm2_class = { + .class_name = "iTerm2 muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_MUXER, +}; + +const FFOutputFormat ff_iterm2_muxer = { + .p.name = "iterm2", + .p.long_name = NULL_IF_CONFIG_SMALL("iTerm2 inline image protocol"), + .priv_data_size = sizeof(ITerm2Context), + .p.audio_codec = AV_CODEC_ID_NONE, + .p.video_codec = AV_CODEC_ID_MJPEG, + .write_packet = iterm2_write_packet, + .write_trailer = iterm2_write_trailer, + .deinit = iterm2_deinit, + .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH, + .p.flags = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS, + .p.priv_class = &iterm2_class, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 904e7f06aa..7ff1483912 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 2 +#define LIBAVFORMAT_VERSION_MINOR 3 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

1 0

[ffmpeg] avformat/wavenc: Don't count padding in rf64 data chunk size (branch master)
by Daniel Verkamp 30 Jun '26

30 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new f1126f2338 avformat/wavenc: Don't count padding in rf64 data chunk size f1126f2338 is described below commit f1126f23380c805b4b8fd69351d189aeac8b892b Author: Daniel Verkamp <daniel(a)drv.nu> AuthorDate: Tue Jun 9 00:01:59 2026 -0700 Commit: Daniel Verkamp <daniel(a)drv.nu> CommitDate: Tue Jun 30 03:03:30 2026 +0000 avformat/wavenc: Don't count padding in rf64 data chunk size When writing the trailer for a RF64 WAV file, the ds64 chunk's 64-bit version of the data chunk size incorrectly included the padding byte that may have been added by ff_end_tag() for the data chunk. Fix this by calculating the data chunk size before calling ff_end_tag(). The data chunk padding byte is only needed when the data is not already a multiple of two bytes in length, which is fairly rare, requiring something like mono 8-bit or 24-bit PCM with an odd number of samples to trigger (and only with -rf64 auto or -rf64 always, neither of which is enabled by default), so this bug is not likely to have affected many real-world files. Signed-off-by: Daniel Verkamp <daniel(a)drv.nu> --- libavformat/wavenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 01fffaafe5..a8debf8faa 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -426,7 +426,8 @@ static int wav_write_trailer(AVFormatContext *s) int ret = 0; if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { - if (wav->write_peak != PEAK_ONLY && avio_tell(pb) - wav->data < UINT32_MAX) { + data_size = avio_tell(pb) - wav->data; + if (wav->write_peak != PEAK_ONLY && data_size < UINT32_MAX) { ff_end_tag(pb, wav->data); } @@ -436,7 +437,6 @@ static int wav_write_trailer(AVFormatContext *s) /* update file size */ file_size = avio_tell(pb); - data_size = file_size - wav->data; if (wav->rf64 == RF64_ALWAYS || (wav->rf64 == RF64_AUTO && file_size - 8 > UINT32_MAX)) { rf64 = 1; } else if (file_size - 8 <= UINT32_MAX) {

1 0

[ffmpeg] tests/checkasm/llviddsp: fix add_left_pred_int16 buffer compare size (branch master)
by Jeongkeun Kim 29 Jun '26

29 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 2be6bf5507 tests/checkasm/llviddsp: fix add_left_pred_int16 buffer compare size 2be6bf5507 is described below commit 2be6bf55079ea512717153f6df673391e9563e78 Author: Jeongkeun Kim <variety0724(a)gmail.com> AuthorDate: Tue Apr 28 13:51:25 2026 +0900 Commit: Martin Storsjö <martin(a)martin.st> CommitDate: Mon Jun 29 21:40:05 2026 +0000 tests/checkasm/llviddsp: fix add_left_pred_int16 buffer compare size dst0/dst1 are uint16_t* allocated as width * sizeof(uint16_t), but the memcmp at the end of check_add_left_pred_16 only compared `width` bytes — missing the second half of each buffer. Same pattern used correctly in tests/checkasm/huffyuvdsp.c (memcmp with width * sizeof()). While at it, fix missing whitespace around & and || on the same line. Fixes: fbe91487797c ("checkasm/llviddsp : add test for other dsp func") Signed-off-by: Jeongkeun Kim <variety0724(a)gmail.com> --- tests/checkasm/llviddsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/llviddsp.c b/tests/checkasm/llviddsp.c index a8245b0d94..1094638229 100644 --- a/tests/checkasm/llviddsp.c +++ b/tests/checkasm/llviddsp.c @@ -145,7 +145,7 @@ static void check_add_left_pred_16(LLVidDSPContext *c, unsigned mask, int width, res0 = call_ref(dst0, src0, mask, width, acc); res1 = call_new(dst1, src1, mask, width, acc); - if ((res0 &0xFFFF) != (res1 &0xFFFF)|| memcmp(dst0, dst1, width)) + if ((res0 & 0xFFFF) != (res1 & 0xFFFF) || memcmp(dst0, dst1, width * sizeof(*dst0))) fail(); bench_new(dst1, src1, mask, width, acc);

1 0

[ffmpeg] branch master updated (7ab12fd02a -> 4552f31db8)
by ffmpeg-git 29 Jun '26

29 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 7ab12fd02a avformat/movenc: use frame_size for EAC3 when merging packets new abb2a04649 Makefile: skip STRIP step when stripping is disabled new cbdbb07900 Makefile: hide verbose command from linking step new 4552f31db8 ffbuild/common.mak: fix source path prefix stripping in INSTALL output The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 2 ++ configure | 4 ++-- ffbuild/common.mak | 2 +- ffbuild/library.mak | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-)

2 3

[ffmpeg-web] web/security: more CVE# (branch master)
by Michael Niedermayer 29 Jun '26

29 Jun '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg-web. The following commit(s) were added to refs/heads/master by this push: new 9f62830 web/security: more CVE# 9f62830 is described below commit 9f62830b2482d7c005ae6c45105cbd0c1b2cfd65 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Jun 29 23:15:07 2026 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Mon Jun 29 23:16:55 2026 +0200 web/security: more CVE# Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- src/security | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/security b/src/security index a5e489c..d1311cf 100644 --- a/src/security +++ b/src/security @@ -65,9 +65,11 @@ Fixes following vulnerabilities: </p> <pre> CVE-2025-12343, b8d5f65b9e89d893f27cf00799dbc15fc0ca2f8e +CVE-2025-22921, bdea5aec2da8ee9dbbc84127d81e056dbbbeda6a, ticket/11393 CVE-2025-67306, faa382e5b196f2acb5bc5b159aaf06682291328b, pr/21108 CVE-2025-67306, 554ae5ada98cd44686ade995102d3aa2295d7b09, pr/21108 CVE-2025-69693, 8abeb879df66ea8d27ce1735925ced5a30813de4 +CVE-2026-30754, d03483bd265b68db00c9b90f6f48dcf61c5c300d </pre> <h2>FFmpeg 8.0</h2> @@ -110,16 +112,20 @@ Fixes following vulnerabilities: CVE-2023-6602, 91d96dc8ddaebe0b6cb393f672085e6bfaf15a31 CVE-2023-6604, 91d96dc8ddaebe0b6cb393f672085e6bfaf15a31 CVE-2023-6605, 4c96d6bf75357ab13808efc9f08c1b41b1bf5bdf +CVE-2024-55069, 4cc1495aca45445181a107a682c32cfe31459929, ticket/11326 CVE-2025-0518, b5b6391d64807578ab872dc58fb8aa621dcfc38a CVE-2025-1373, 43be8d07281caca2e88bfd8ee2333633e1fb1a13, ticket/11460 never affected a release CVE-2025-1594, bedfb6eca402037f5cbb115fa767d106b8c14f1c, ticket/11418 CVE-2025-1816, 0526535cd58444dd264e810b2f3348b4d96cff3b, ticket/11475, CVE-2025-9951, 104d6846c1be0cb757dc95d5801a416f4d7c687d CVE-2025-9951, 01a292c7e36545ddeb3c7f79cd02e2611cd37d73 +CVE-2025-10256, a25462482c02c004d685a8fcf2fa63955aaa0931 CVE-2025-12343, 263e819aa45cd3c48bf6887be02b4ec504c02048 / b8d5f65b9e89d893f27cf00799dbc15fc0ca2f8e CVE-2025-22919, 1446e37d3d032e1452844778b3e6ba2c20f0c322, ticket/11385, CVE-2025-22920, 4bf784c0e5615c3f934e677d5de093a8be7da7ae, ticket/11389 never affected a release +CVE-2025-25469, d5873be583ada9e1fb887e2fe8dcfd4b12e0efcd, ticket/11416 CVE-2025-25471, fd1772b7475d0d5673a5dd314ee78443d0be4cf1, ticket/11417 never affected a release +CVE-2025-25473, c08d300481b8ebb846cd43a473988fdbc6793d1b, ticket/11419 CVE-2025-59728, ce0a655f85c1144d19a4acad59afbb92e4997e30, BIGSLEEP-433502298 CVE-2025-59729, 33ae6cda71e6d34c9081a612abae00e2c7d39f72, BIGSLEEP-433513232 CVE-2025-59730, 3ccd7d8c8e85aaae0c6d6cc88ea6cb5309d56cdc, BIGSLEEP-434637586

1 0