virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

tls: fix compilation when both gnutls and openssl are enabled

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
James Almer 2015-05-22 00:32:17 -03:00 committed by Martin Storsjö
parent 94599a6de3
commit 29216d7fd1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/tls.c
View File

@ -213,7 +213,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
struct addrinfo hints = { 0 }, *ai = NULL; struct addrinfo hints = { 0 }, *ai = NULL;
const char *proxy_path; const char *proxy_path;
int use_proxy; int use_proxy;
#if CONFIG_OPENSSL #if CONFIG_OPENSSL && !CONFIG_GNUTLS
BIO *bio; BIO *bio;
#endif #endif