diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:26:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:26:55 +0200 |
| commit | e07e8882ae92b3328ca3ae97b494e5c2158256dd (patch) | |
| tree | 0f93b87aa0554d25b8b55bcbdb5aa3fb72f6aa6d | |
| parent | 6c5989cce9e3ef93766a3c62096d4a08ee4be7c1 (diff) | |
| parent | a77aed142cade3beb0cd43f879d4f47daae23b8a (diff) | |
| download | ffmpeg-e07e8882ae92b3328ca3ae97b494e5c2158256dd.tar.gz | |
Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
fate: Rename video filters file and add separate video filters target
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak (renamed from tests/fate/filter.mak) | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index acc27b66e1..b26729396d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -88,7 +88,7 @@ include $(SRC_PATH)/tests/fate/ea.mak include $(SRC_PATH)/tests/fate/ffmpeg.mak include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/filter-audio.mak -include $(SRC_PATH)/tests/fate/filter.mak +include $(SRC_PATH)/tests/fate/filter-video.mak include $(SRC_PATH)/tests/fate/flac.mak include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/gif.mak diff --git a/tests/fate/filter.mak b/tests/fate/filter-video.mak index 7fc029be36..e6e0ac546c 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter-video.mak @@ -89,4 +89,6 @@ fate-filter-metadata-ebur128: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SR FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes) -fate-filter: $(FATE_FILTER-yes) $(FATE_FILTER_VSYNTH-yes) $(FATE_METADATA_FILTER-yes) +fate-vfilter: $(FATE_FILTER-yes) $(FATE_FILTER_VSYNTH-yes) + +fate-filter: fate-afilter fate-vfilter $(FATE_METADATA_FILTER-yes) |