diff options
| author | Ludmila Glinskih <lglinskih@gmail.com> | 2015-06-28 01:50:25 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-29 02:49:32 +0200 |
| commit | ca3b27455234fbd216a1be088587c97a1927e316 (patch) | |
| tree | 23185bc95e0e2495ebd1d73d5b9ec1b26bd4ae76 /tests/fate | |
| parent | 02bd4d93c9df722fcd77153d2a894286cd96a491 (diff) | |
api-h264-test: build with another api test
Location of api-h264-test changed to special directory for api tests.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/api.mak | 9 | ||||
| -rw-r--r-- | tests/fate/libavformat.mak | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/fate/api.mak b/tests/fate/api.mak index 2127b9b94d..da5003646b 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -4,5 +4,12 @@ fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test fate-api-flac: CMP = null fate-api-flac: REF = /dev/null +FATE_API_SAMPLES-LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264 +fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF) +fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 + FATE-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes) -fate-api: $(FATE_API_LIBAVCODEC-yes) +FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES-LIBAVFORMAT-yes) +FATE_SAMPLES_AVCONV += $(FATE_API_SAMPLES-yes) + +fate-api: $(FATE_API_LIBAVCODEC-yes) $(FATE_API_SAMPLES-yes) diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 0e1ff62ba1..a9c02bcbaf 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -14,9 +14,5 @@ FATE_LIBAVFORMAT-yes += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test -FATE_SAMPLES_AVCONV-$(call DEMDEC, H264, H264) += fate-api-h264 -fate-api-h264: libavformat/api-h264-test$(EXESUF) -fate-api-h264: CMD = run libavformat/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 - FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes) fate-libavformat: $(FATE_LIBAVFORMAT) |