[FFmpeg-cvslog] fate/filter: move concat filtergraph to a dedicated script.

Clément Bœsch git at videolan.org
Thu Mar 28 17:45:42 CET 2013


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Mar 28 17:30:46 2013 +0100| [0adc93ba2b4c86bb0b5e0587df1f9c543f5232b6] | committer: Clément Bœsch

fate/filter: move concat filtergraph to a dedicated script.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0adc93ba2b4c86bb0b5e0587df1f9c543f5232b6
---

 tests/fate/filter.mak     |    2 +-
 tests/filtergraphs/concat |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak
index 1274101..f1777e2 100644
--- a/tests/fate/filter.mak
+++ b/tests/fate/filter.mak
@@ -116,7 +116,7 @@ FATE_FILTER-$(call ALLYES, VMD_DEMUXER VMDVIDEO_DECODER FORMAT_FILTER PERMS_FILT
 fate-filter-gradfun-sample: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vf "sws_flags=+accurate_rnd+bitexact;format=gray,perms=random,gradfun=10:8" -an -frames:v 20
 
 FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat
-fate-filter-concat: CMD = framecrc -lavfi "testsrc=r=5:n=1:d=2[v1];sine=440:b=2:d=1[a1];testsrc=r=5:n=1:d=1[v2];sine=622:b=2:d=2[a2];testsrc=r=5:n=1:d=1[v3];sine=880:b=2:d=1[a3];[v1][a1][v2][a2][v3][a3]concat=v=1:a=1:n=3"
+fate-filter-concat: CMD = framecrc -filter_complex_script $(SRC_PATH)/tests/filtergraphs/concat
 
 $(FATE_FILTER_VSYNTH-yes): tests/vsynth1/00.pgm
 $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm
diff --git a/tests/filtergraphs/concat b/tests/filtergraphs/concat
new file mode 100644
index 0000000..26bca14
--- /dev/null
+++ b/tests/filtergraphs/concat
@@ -0,0 +1,8 @@
+testsrc=r=5:n=1:d=2 [v1];
+sine=440:b=2:d=1    [a1];
+testsrc=r=5:n=1:d=1 [v2];
+sine=622:b=2:d=2    [a2];
+testsrc=r=5:n=1:d=1 [v3];
+sine=880:b=2:d=1    [a3];
+
+[v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3



More information about the ffmpeg-cvslog mailing list