diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:39:57 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:39:57 +0100 |
| commit | 8f540b86125a25ee48ea6da69139356063726b8e (patch) | |
| tree | 1e83b62764e4cba6d2fcacfb93893eccfdc15a97 /libavformat | |
| parent | 9b36f446acbfa8322185b7af673f7a40a6d9095f (diff) | |
| parent | 65a802401c6cc136576bb2e613c0577cbf622aa8 (diff) | |
| download | ffmpeg-streaming-8f540b86125a25ee48ea6da69139356063726b8e.zip ffmpeg-streaming-8f540b86125a25ee48ea6da69139356063726b8e.tar.gz | |
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
build: Add component for the SRTP common code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 4bae3b7..51260f4 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -57,10 +57,10 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_vc2hq.o \ rtpdec_vp8.o \ rtpdec_vp9.o \ - rtpdec_xiph.o \ - srtp.o + rtpdec_xiph.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o +OBJS-$(CONFIG_SRTP) += srtp.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o @@ -573,13 +573,13 @@ SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h TESTPROGS = seek \ - srtp \ url \ # async \ TESTPROGS-$(CONFIG_MOV_MUXER) += movenc TESTPROGS-$(CONFIG_NETWORK) += noproxy TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh +TESTPROGS-$(CONFIG_SRTP) += srtp TOOLS = aviocat \ ismindex \ |
