summaryrefslogtreecommitdiffstats
path: root/tests/Makefile
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-29 11:03:55 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-29 11:05:49 +0200
commitdd1b1e32238be7e0abfbc90f546f4c1931915143 (patch)
tree4b8abd932b61ab59663a97c9a6568653d33d38e7 /tests/Makefile
parentdb0af7250a276700a349766c5412eb48ec630f0a (diff)
parentc3ed259e4fef64a1af4f6537be545fba47491aa9 (diff)
downloadffmpeg-streaming-dd1b1e32238be7e0abfbc90f546f4c1931915143.zip
ffmpeg-streaming-dd1b1e32238be7e0abfbc90f546f4c1931915143.tar.gz
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'
* commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9': fate: Move Canopus decoder tests to a separate file Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile
index e72b8df..019203c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -112,6 +112,7 @@ include $(SRC_PATH)/tests/fate/api.mak
include $(SRC_PATH)/tests/fate/atrac.mak
include $(SRC_PATH)/tests/fate/audio.mak
include $(SRC_PATH)/tests/fate/bmp.mak
+include $(SRC_PATH)/tests/fate/canopus.mak
include $(SRC_PATH)/tests/fate/cdxl.mak
include $(SRC_PATH)/tests/fate/checkasm.mak
include $(SRC_PATH)/tests/fate/concatdec.mak
OpenPOWER on IntegriCloud