diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 21:55:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-17 21:55:27 +0100 |
| commit | 36258f98299409666ab373d04699618e9662e367 (patch) | |
| tree | 38c972902b77e4ab1c6980464809325256a0f719 /tests/ref/fate/ffmpeg-lavfi | |
| parent | c603f22683d85ce45909582fe12cdb4753f9f616 (diff) | |
| parent | ec7fc7b7d1f00fb8725d7812a018aed2ad1af132 (diff) | |
| download | ffmpeg-36258f98299409666ab373d04699618e9662e367.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
fate: add a test for -filter_complex / -lavfi without input.
ffmpeg: make -lavfi an alias for -filter_complex.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffmpeg-lavfi')
| -rw-r--r-- | tests/ref/fate/ffmpeg-lavfi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/ref/fate/ffmpeg-lavfi b/tests/ref/fate/ffmpeg-lavfi new file mode 100644 index 0000000000..54d318db9d --- /dev/null +++ b/tests/ref/fate/ffmpeg-lavfi @@ -0,0 +1,6 @@ +#tb 0: 1/5 +0, 0, 0, 1, 115200, 0x375ec573 +0, 1, 1, 1, 115200, 0x375ec573 +0, 2, 2, 1, 115200, 0x375ec573 +0, 3, 3, 1, 115200, 0x375ec573 +0, 4, 4, 1, 115200, 0x375ec573 |