From patchwork Tue Dec 10 14:02:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 16696 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F3E0D448284 for ; Tue, 10 Dec 2019 16:34:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDED468AF01; Tue, 10 Dec 2019 16:34:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 415DC68A8F0 for ; Tue, 10 Dec 2019 16:34:49 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id g6so7379929plp.7 for ; Tue, 10 Dec 2019 06:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cHnHOw9hrHbDpQsszFLoIA1LTDLkitt8UTgOSYjPhxM=; b=V6PnwRp84O+A6Ia+Emf2zpmcqA8J/bdleIjk6R4Y00T3vE32k0wJm3QuvCsxXT5tDH uNbRJN2sB7iAAOuHRuN8R3SbDGCjzPyn8QMUc6RNmy1k0gT4xVfTdnVWsOQds/07j5GA QKghW7NlbNKqZar48dZl5jJ9oRwGt7sLTIWXXXHEKgEjbEU1vfamikpJeMmzvx3WNZOX Jlaw0FBQJ/4bJVfsySMf3GmU8niC8UoCPekNzQKZXoY/ALLdDU5jPGunqr4FfSWZuHuy VZjIU3XJXl74/9qf8rfgjuZwOC+vkBe7Z0FgAFVJ/Qvj6KGdfnM9r0ctKtNSjfPr129Q DTcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cHnHOw9hrHbDpQsszFLoIA1LTDLkitt8UTgOSYjPhxM=; b=LDe1Pu8uASsUT/N6mvtmyrj1RhVh6MOkKc3KD8SmoMsE40tn4ICKCZfSEh1/U4bRvj RyNb+x4Z0Lsl/EIkvQxypl0HGOmnhkR1JrLWwzT9Ui2DdwbwDUv346fOtXWITTA0CX/+ VyOyXXlcZU8Yo+Qmi+4HlWl3cu3YHRhVECLBfw5zuAFy9iBwTm+dSj6q7mgPY7ZuAelP STOnqmmvKwy4uGOhr94Nua0CGZSV/Ep6B8XWSBdJx6L8/s9bM3CURGaxLi8I05fQnkYw qQnirr/JDCV1StiAMySBRrwcSSrw/URNcn3U6rlZm0SHaD6SgbmlW4wJC8u0TcaAB7zz bxNg== X-Gm-Message-State: APjAAAVbMv25Mh2kq/NNHznGUVS9UZBeUOsx7UKo/qq7egVepbk4D6++ F2DYHFoCswBL44ZCF0FaXl7SJkyU X-Google-Smtp-Source: APXvYqx/se2GKhVY3hph8KV0hK+guoS+C6WASQb+js+PclYSa0H5qXqUIngRDiecDL7ZF7U591ooPg== X-Received: by 2002:a17:90b:3109:: with SMTP id gc9mr5648256pjb.30.1575986585793; Tue, 10 Dec 2019 06:03:05 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id 23sm3245584pjx.29.2019.12.10.06.03.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2019 06:03:04 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:02:53 +0800 Message-Id: <1575986573-5561-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1575986573-5561-1-git-send-email-mypopydev@gmail.com> References: <1575986573-5561-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/2] lavf/tls_openssl: support both pre-1.1.0 and post-1.1.0 init X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao 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 --- libavformat/tls_openssl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 7ae71bd..1f57353 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -70,8 +70,12 @@ int ff_openssl_init(void) { ff_lock_avformat(); if (!openssl_init) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L SSL_library_init(); SSL_load_error_strings(); +#else + OPENSSL_init_ssl(0, NULL); +#endif #if HAVE_THREADS if (!CRYPTO_get_locking_callback()) { int i;