MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/tls_openssl: don't use libcrypto locking functions with newer OpenSSL versions 

They have been removed altogether without a compat implementation, and are
either no-ops or return NULL.
This fixes compiler warnings about checks always evaluating to false, and leaks
of allocated mutexes.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-12-11 13:11:59 -03:00
parent 8887991a31
commit abf5e7bc21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/tls_openssl.c
View File

@ -48,7 +48,7 @@ typedef struct TLSContext {
#endif
} TLSContext;
#if HAVE_THREADS
#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
#include <openssl/crypto.h>
pthread_mutex_t *openssl_mutexes;
static void openssl_lock(int mode, int type, const char *file, int line)
@ -79,7 +79,7 @@ int ff_openssl_init(void)
SSL_library_init();
SSL_load_error_strings();
#endif
#if HAVE_THREADS
#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
if (!CRYPTO_get_locking_callback()) {
int i;
openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks());
@ -108,7 +108,7 @@ void ff_openssl_deinit(void)
ff_lock_avformat();
openssl_init--;
if (!openssl_init) {
#if HAVE_THREADS
#if HAVE_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L
if (CRYPTO_get_locking_callback() == openssl_lock) {
int i;
CRYPTO_set_locking_callback(NULL);