PR #25403 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25403 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/25403.patch
>From 97074e9eff900917a3ebda7df89b7091acb1a3bc Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Fri, 23 Oct 2026 18:12:15 -0300 Subject: [PATCH] test/fate/preroll: fix parsing entries in preroll.ffconcat when using relative path for the samples suite Signed-off-by: James Almer <[email protected]> --- tests/Makefile | 6 +++++- tests/fate/preroll.mak | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 54b1b7005f3..35952e7e2b7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -23,7 +23,7 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) $(AREF): CMP= APITESTSDIR := tests/api -FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/maps tests/data/streamgroups tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) +FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/maps tests/data/streamgroups tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 tests/data/samples $(APITESTSDIR) OUTDIRS += $(FATE_OUTDIRS) $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 @@ -65,6 +65,10 @@ tests/data/streamgroups/%: TAG = COPY tests/data/streamgroups/%: $(SRC_PATH)/tests/streamgroups/% | tests/data/streamgroups $(M)cp $< $@ +tests/data/samples/%: TAG = COPY +tests/data/samples/%: $(TARGET_SAMPLES)/% | tests/data/samples + $(M)cp --parents $< $(TARGET_PATH)/tests/data/samples/ + tests/data/fate/%.amr: TAG = GEN tests/data/fate/%.amr: tests/amrgen$(HOSTEXESUF) | tests/data/fate $(M)./$< $@ diff --git a/tests/fate/preroll.mak b/tests/fate/preroll.mak index 35522cdb6a3..b969bd72ace 100644 --- a/tests/fate/preroll.mak +++ b/tests/fate/preroll.mak @@ -63,7 +63,8 @@ fate-preroll-aac-mov-seek-staggered: CMD = seek_staggered $(TARGET_SAMPLES)/gapl # A seek through the concat demuxer, which seeks in the file it reads. FATE_PREROLL_SEEK-$(call ALLYES, CONCAT_DEMUXER MOV_DEMUXER AAC_DECODER FILE_PROTOCOL) += fate-preroll-aac-concat-seek -fate-preroll-aac-concat-seek: CMD = seek_concat $(SRC_PATH)/tests/preroll.ffconcat $(TARGET_SAMPLES)/gapless/102400samples_qt-lc-aac.m4a -seekback 530000 -frames 3 -duration 3 +fate-preroll-aac-concat-seek: tests/data/samples/gapless/102400samples_qt-lc-aac.m4a +fate-preroll-aac-concat-seek: CMD = seek_concat $(SRC_PATH)/tests/preroll.ffconcat ../samples/gapless/102400samples_qt-lc-aac.m4a -seekback 530000 -frames 3 -duration 3 # A seek close to the start of a stream whose start time is unknown. FATE_PREROLL_SEEK-$(call DEMDEC, AAC, AAC) += fate-preroll-aac-adts-seek-start -- 2.54.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
