diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:34:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:34:23 +0200 |
| commit | 124244ec48c1b733b7ad40eee67ae1a205f0162b (patch) | |
| tree | 008dc0200bf07f47103ba573a247c8e8ba15fc78 /tests/Makefile | |
| parent | 04001767728fd4ed8b4f9d2ebbb9f9a8c9a7be0d (diff) | |
| parent | b963f021b603509b5159873de4919dec441d0782 (diff) | |
| download | ffmpeg-124244ec48c1b733b7ad40eee67ae1a205f0162b.tar.gz | |
Merge commit 'b963f021b603509b5159873de4919dec441d0782'
* commit 'b963f021b603509b5159873de4919dec441d0782':
fate: Invoke pixfmts lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index b26729396d..8209435501 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -66,9 +66,11 @@ FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_E include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak -include $(SRC_PATH)/tests/fate/avfilter.mak include $(SRC_PATH)/tests/fate/seek.mak +#FIXME should be removed +include $(SRC_PATH)/tests/fate/avfilter.mak + include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/ac3.mak include $(SRC_PATH)/tests/fate/adpcm.mak |