summaryrefslogtreecommitdiffstats
path: root/tests/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-17 12:52:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-17 12:59:07 +0200
commita708689fdac62540d87b4233315e47be1a52a79d (patch)
tree521bc77522da4478fbf8fa5ead8f76e0380f08fe /tests/Makefile
parent1aed82846cbcdd19cab9d2eea0f7aaaa45fb674a (diff)
parentf29c226af0ecc34c417b646580a9acd7d8bbaf48 (diff)
downloadffmpeg-streaming-a708689fdac62540d87b4233315e47be1a52a79d.zip
ffmpeg-streaming-a708689fdac62540d87b4233315e47be1a52a79d.tar.gz
Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'
* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48': fate: add mpeg4 tests for frame size changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 386d883..f08f924 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -131,6 +131,7 @@ include $(SRC_PATH)/tests/fate/microsoft.mak
include $(SRC_PATH)/tests/fate/monkeysaudio.mak
include $(SRC_PATH)/tests/fate/mp3.mak
include $(SRC_PATH)/tests/fate/mpc.mak
+include $(SRC_PATH)/tests/fate/mpeg4.mak
include $(SRC_PATH)/tests/fate/opus.mak
include $(SRC_PATH)/tests/fate/pcm.mak
include $(SRC_PATH)/tests/fate/probe.mak
OpenPOWER on IntegriCloud