diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-17 21:55:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-17 21:55:27 +0100 |
| commit | 36258f98299409666ab373d04699618e9662e367 (patch) | |
| tree | 38c972902b77e4ab1c6980464809325256a0f719 /libavformat/concat.c | |
| parent | c603f22683d85ce45909582fe12cdb4753f9f616 (diff) | |
| parent | ec7fc7b7d1f00fb8725d7812a018aed2ad1af132 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat/concat.c')
0 files changed, 0 insertions, 0 deletions