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 598857bf35 test/fate/preroll: fix parsing entries in preroll.ffconcat
when using relative path for the samples suite
598857bf35 is described below
commit 598857bf35183ff7155a1299a5d6e3e210777109
Author: James Almer <[email protected]>
AuthorDate: Fri Oct 23 18:12:15 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Fri Oct 23 19:49:55 2026 -0300
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 54b1b7005f..7d1597bdf7 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 $< tests/data/samples/$(subst /,_,$*)
+
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 35522cdb6a..243b9d0731 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
--
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
