diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:11:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:13:20 +0200 |
| commit | 6c5989cce9e3ef93766a3c62096d4a08ee4be7c1 (patch) | |
| tree | 1c521fd9b90a99cc33e2768b1511b29bc3eef382 /tests/Makefile | |
| parent | 4cb59ad84b97e50549f22998b2a83d0a1e7f4b97 (diff) | |
| parent | b357f1d1d3dd1d6672df6a397a31be425d31b6d1 (diff) | |
| download | ffmpeg-6c5989cce9e3ef93766a3c62096d4a08ee4be7c1.tar.gz | |
Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
fate: Split audio filters into their own separate file
Conflicts:
tests/Makefile
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index c9ebb6efba..acc27b66e1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -59,6 +59,10 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +FILTERDEMDEC = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER) +FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) +FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) + include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak @@ -83,6 +87,7 @@ include $(SRC_PATH)/tests/fate/dpcm.mak 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/flac.mak include $(SRC_PATH)/tests/fate/fft.mak |