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/fate | |
| 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/fate')
| -rw-r--r-- | tests/fate/ffmpeg.mak | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index cc0e22add3..b96bfb3299 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -15,6 +15,12 @@ FATE_MAPCHAN = $(FATE_MAPCHAN-yes) FATE_FFMPEG += $(FATE_MAPCHAN) fate-mapchan: $(FATE_MAPCHAN) +FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-filter_complex +fate-ffmpeg-filter_complex: CMD = framecrc -filter_complex color=d=1:r=5 + +FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-lavfi +fate-ffmpeg-lavfi: CMD = framecrc -lavfi color=d=1:r=5 + FATE_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames fate-force_key_frames: tests/data/vsynth2.yuv fate-force_key_frames: CMD = enc_dec \ |