[FFmpeg-devel] [PATCH 1/4] lavf/tls_openssl: silence warning on OpenSSL 1.1 and later

Nicolas George george at nsup.org
Thu Jan 17 11:12:01 EET 2019


Rodger Combs (12019-01-17):
> ---
>  libavformat/tls_openssl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
> index 7ae71bdaf3..faa5b8636e 100644
> --- a/libavformat/tls_openssl.c
> +++ b/libavformat/tls_openssl.c
> @@ -102,7 +102,7 @@ void ff_openssl_deinit(void)
>      openssl_init--;
>      if (!openssl_init) {
>  #if HAVE_THREADS

> -        if (CRYPTO_get_locking_callback() == openssl_lock) {
> +        if (CRYPTO_get_locking_callback() == &openssl_lock) {

Using the & operator on a function seems strange. What warnings is it
supposed to fix, and why?

>              int i;
>              CRYPTO_set_locking_callback(NULL);
>              for (i = 0; i < CRYPTO_num_locks(); i++)

Regards,

-- 
  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190117/a6cb4aab/attachment.sig>


More information about the ffmpeg-devel mailing list