[FFmpeg-cvslog] lavf/tls_openssl: support both pre-1.1.0 and post-1.1.0 init

Jun Zhao git at videolan.org
Wed Dec 11 08:49:12 EET 2019


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Tue Dec 10 17:41:56 2019 +0800| [4eae85a82f81fa2ff4c317797ca3d82caf35db86] | committer: Jun Zhao

lavf/tls_openssl: support both pre-1.1.0 and post-1.1.0 init

supporting both pre-1.1.0 and post-1.1.0 version of the OpenSSL
library as the link:
https://wiki.openssl.org/index.php/Library_Initialization

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eae85a82f81fa2ff4c317797ca3d82caf35db86
---

 libavformat/tls_openssl.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 7ae71bdaf3..53f8363a12 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -70,8 +70,15 @@ int ff_openssl_init(void)
 {
     ff_lock_avformat();
     if (!openssl_init) {
+        /* OpenSSL 1.0.2 or below, then you would use SSL_library_init. If you are
+         * using OpenSSL 1.1.0 or above, then the library will initialize
+         * itself automatically.
+         * https://wiki.openssl.org/index.php/Library_Initialization
+         */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         SSL_library_init();
         SSL_load_error_strings();
+#endif
 #if HAVE_THREADS
         if (!CRYPTO_get_locking_callback()) {
             int i;



More information about the ffmpeg-cvslog mailing list