Commit e07e8882 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a77aed14'

* commit 'a77aed14':
  fate: Rename video filters file and add separate video filters target

Conflicts:
	tests/fate/filter-video.mak
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c5989cc a77aed14
......@@ -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
......
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment