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/tls.h | |
| 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/tls.h')
| -rw-r--r-- | libavformat/tls.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/tls.h b/libavformat/tls.h index 0326ef7924..9c851bf132 100644 --- a/libavformat/tls.h +++ b/libavformat/tls.h @@ -26,8 +26,6 @@ #include "url.h" #include "libavutil/opt.h" -#define CONFIG_TLS_PROTOCOL (CONFIG_TLS_GNUTLS_PROTOCOL | CONFIG_TLS_OPENSSL_PROTOCOL | CONFIG_TLS_SECURETRANSPORT_PROTOCOL | CONFIG_TLS_SCHANNEL_PROTOCOL) - typedef struct TLSShared { char *ca_file; int verify; |