summaryrefslogtreecommitdiffstats
path: root/tests/Makefile
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-03-14 14:47:57 -0300
committerJames Almer <jamrial@gmail.com>2019-03-14 14:59:45 -0300
commitac4b5d86222006fa71ffe5922e1a34f1422507d8 (patch)
treecd09cadf2ee0eb1d5810cc4337fdb4d15ccb3ec4 /tests/Makefile
parenta200bf8094bfaa0a0e4cf2fa270a18167a833d75 (diff)
parentf8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b (diff)
downloadffmpeg-streaming-ac4b5d86222006fa71ffe5922e1a34f1422507d8.zip
ffmpeg-streaming-ac4b5d86222006fa71ffe5922e1a34f1422507d8.tar.gz
Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b'
* commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b': tests: Add a convenience function for video-only lavf tests Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 3d88a5d..ae48db8 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -89,11 +89,11 @@ include $(SRC_PATH)/$(APITESTSDIR)/Makefile
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/lavf-audio.mak
include $(SRC_PATH)/tests/fate/lavf-container.mak
include $(SRC_PATH)/tests/fate/lavf-image.mak
include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak
+include $(SRC_PATH)/tests/fate/lavf-video.mak
include $(SRC_PATH)/tests/fate/seek.mak
include $(SRC_PATH)/tests/fate/aac.mak
@@ -170,6 +170,7 @@ include $(SRC_PATH)/tests/fate/qt.mak
include $(SRC_PATH)/tests/fate/qtrle.mak
include $(SRC_PATH)/tests/fate/real.mak
include $(SRC_PATH)/tests/fate/screen.mak
+include $(SRC_PATH)/tests/fate/segment.mak
include $(SRC_PATH)/tests/fate/source.mak
include $(SRC_PATH)/tests/fate/speedhq.mak
include $(SRC_PATH)/tests/fate/subtitles.mak
OpenPOWER on IntegriCloud