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/protocols.c | |
| parent | bc98788dd262aacf017fb27d3e1de03f9009839f (diff) | |
| parent | 61cec5adaacb358783c18aa07362f15824c1b274 (diff) | |
| download | ffmpeg-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/protocols.c')
| -rw-r--r-- | libavformat/protocols.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 8d3555ed52..669d74d5a8 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -56,10 +56,7 @@ extern const URLProtocol ff_srtp_protocol; extern const URLProtocol ff_subfile_protocol; extern const URLProtocol ff_tee_protocol; extern const URLProtocol ff_tcp_protocol; -extern const URLProtocol ff_tls_gnutls_protocol; -extern const URLProtocol ff_tls_schannel_protocol; -extern const URLProtocol ff_tls_securetransport_protocol; -extern const URLProtocol ff_tls_openssl_protocol; +extern const URLProtocol ff_tls_protocol; extern const URLProtocol ff_udp_protocol; extern const URLProtocol ff_udplite_protocol; extern const URLProtocol ff_unix_protocol; |