[FFmpeg-cvslog] Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Apr 21 16:02:26 2016 +0100| [420806f0d14a8de81cfbd38032649c710eec7ac1] | committer: Derek Buitenhuis

Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'

* commit 'b298b36fc008ad94a24929fe770c8189d96bcac4':
  fate: Only run SRTP test if SRTP code is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=420806f0d14a8de81cfbd38032649c710eec7ac1
---

 tests/fate/libavformat.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 5d9914a..f88d6fa 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
 


======================================================================