diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:02:26 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:02:35 +0100 |
| commit | 420806f0d14a8de81cfbd38032649c710eec7ac1 (patch) | |
| tree | 116cae0ee57540b6f48e89d143ca42f006761706 | |
| parent | 7e3d3a6a895f80e8a376a3ba37054eb84b44f671 (diff) | |
| parent | b298b36fc008ad94a24929fe770c8189d96bcac4 (diff) | |
| download | ffmpeg-420806f0d14a8de81cfbd38032649c710eec7ac1.tar.gz | |
Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'
* commit 'b298b36fc008ad94a24929fe770c8189d96bcac4':
fate: Only run SRTP test if SRTP code is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | tests/fate/libavformat.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 5d9914a98a..f88d6fa5b6 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -10,7 +10,7 @@ FATE_LIBAVFORMAT-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += fate-rtmpdh fate-rtmpdh: libavformat/rtmpdh-test$(EXESUF) fate-rtmpdh: CMD = run libavformat/rtmpdh-test -FATE_LIBAVFORMAT-yes += fate-srtp +FATE_LIBAVFORMAT-$(CONFIG_SRTP) += fate-srtp fate-srtp: libavformat/srtp-test$(EXESUF) fate-srtp: CMD = run libavformat/srtp-test |