diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:27 +0100 |
| commit | 9ea65c65f70029896b1c23afd9925ae42c4d009f (patch) | |
| tree | 213694091e2eb5a1480ca8427649f8be51be0a17 /libavformat/Makefile | |
| parent | 06af724c56c9fd74bb6ace457f39e1768bd94246 (diff) | |
| parent | 0eecafc948b74c247ebbc59f18f508db5d590d0b (diff) | |
Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
configure: Make the new srtp protocol depend on the rtp protocol
lavf: Add a fate test for the SRTP functions
lavu: Add a fate test for the HMAC API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index dc3abfd786..2809911729 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -439,6 +439,7 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h TESTPROGS = seek \ + srtp \ url \ TOOLS = aviocat \ |