diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-01 16:26:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-01 16:52:05 -0300 |
| commit | 4600b0619afc58b58de1a21d7a2c472e0d788282 (patch) | |
| tree | 73b866d214b0214fae5e92fb524fe58f84a9fa8e /libavformat/Makefile | |
| parent | bc98788dd262aacf017fb27d3e1de03f9009839f (diff) | |
| parent | 61cec5adaacb358783c18aa07362f15824c1b274 (diff) | |
| download | ffmpeg-streaming-4600b0619afc58b58de1a21d7a2c472e0d788282.zip ffmpeg-streaming-4600b0619afc58b58de1a21d7a2c472e0d788282.tar.gz | |
Merge commit '61cec5adaacb358783c18aa07362f15824c1b274'
* commit '61cec5adaacb358783c18aa07362f15824c1b274':
tls: Hide backend implementation details from users
Also includes ed434be106a4615e0419b3ac7664220741afda2d
Changes were made to support schannel and securetransport.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 591a14b..caebe5b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -586,10 +586,11 @@ OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o -OBJS-$(CONFIG_TLS_GNUTLS_PROTOCOL) += tls_gnutls.o tls.o -OBJS-$(CONFIG_TLS_OPENSSL_PROTOCOL) += tls_openssl.o tls.o -OBJS-$(CONFIG_TLS_SCHANNEL_PROTOCOL) += tls_schannel.o tls.o -OBJS-$(CONFIG_TLS_SECURETRANSPORT_PROTOCOL) += tls_securetransport.o tls.o +TLS-OBJS-$(CONFIG_GNUTLS) += tls_gnutls.o +TLS-OBJS-$(CONFIG_OPENSSL) += tls_openssl.o +TLS-OBJS-$(CONFIG_SECURETRANSPORT) += tls_securetransport.o +TLS-OBJS-$(CONFIG_SCHANNEL) += tls_schannel.o +OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o $(TLS-OBJS-yes) OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UDPLITE_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o |
