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/network.c | |
| parent | bc98788dd262aacf017fb27d3e1de03f9009839f (diff) | |
| parent | 61cec5adaacb358783c18aa07362f15824c1b274 (diff) | |
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/network.c')
| -rw-r--r-- | libavformat/network.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index b3987a4d11..6c3d9def3b 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -29,25 +29,29 @@ int ff_tls_init(void) { -#if CONFIG_TLS_OPENSSL_PROTOCOL +#if CONFIG_TLS_PROTOCOL +#if CONFIG_OPENSSL int ret; if ((ret = ff_openssl_init()) < 0) return ret; #endif -#if CONFIG_TLS_GNUTLS_PROTOCOL +#if CONFIG_GNUTLS ff_gnutls_init(); #endif +#endif return 0; } void ff_tls_deinit(void) { -#if CONFIG_TLS_OPENSSL_PROTOCOL +#if CONFIG_TLS_PROTOCOL +#if CONFIG_OPENSSL ff_openssl_deinit(); #endif -#if CONFIG_TLS_GNUTLS_PROTOCOL +#if CONFIG_GNUTLS ff_gnutls_deinit(); #endif +#endif } int ff_network_inited_globally; |