From patchwork Fri Jan 18 08:46:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 11789 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 2B8AD44E019 for ; Fri, 18 Jan 2019 10:46:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46CE668AC5D; Fri, 18 Jan 2019 10:46:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f182.google.com (mail-it1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E284968AC5D for ; Fri, 18 Jan 2019 10:46:00 +0200 (EET) Received: by mail-it1-f182.google.com with SMTP id w18so5706961ite.1 for ; Fri, 18 Jan 2019 00:46:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=l/qRDI5kmbRGw2PCxaKiuM7ybsU/PPQ+GLtQB/uGi6U=; b=gUYUXBWrRxdO/nIt5+r6+lczz7FtgHthSFZ2fxoXQNg9rpnU0jrEfJKVt4viPMEQhc 1P7CKM0kE24rgx07y3WtxjsDF5CkLPA1kI/YTmdfhmLVYiiSTU057zsF+ZSuXq1lwzmp Q0XvMFN24OzpkAEAS832itWAhVKofHPZ4816zBvjYlwQmw37DJbudaaWmVfD3I43us/7 SsVaedgbPMklYPKzM2wYiVxpRS5G2VIrvGxnZDX4sClh0pYWwzulu8GEix/hMyyVZo44 BhNUHYMOdVf0QOuc3u71WYB2g3AQJdqoaGihe3UIyT4JBV8ZarUEcbAixpBHPyY5MUEm Iliw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=l/qRDI5kmbRGw2PCxaKiuM7ybsU/PPQ+GLtQB/uGi6U=; b=Wm3XTtGvJPuFks+EZR46DzdBmKDq0O3xVSTp/cAMgmCxvHg5P1uFthcqTGzi5LrubA jvZPBGHYeey4GP7tqeDy+8YSFhQIsI4Sj0aYrVxkOjGr6BJ2vdKakAdrBnIvQ9yC1ke8 A2LXPHbIsAiffS+K9ohl67uOt9mh1QOnhXsbH6ULmoNiYvndWxeZ6NFUVNJDygPi2+zB gnJKMHbdpxd1logWnkYZVwoJB2ehn6h57dmat1Uv0CTL9XnTPZMNS8z+jXZiD53CGY0Q FFE5lz3lQg8KvAUcLvFrMyACNq7DDzwGgVZhj+wr7w6kFClJAt8dqx47JlR0D+6/rPgB jY9Q== X-Gm-Message-State: AJcUukeZM4Fd4MWz0Gg668M8fReZDwapmu6SyOEWUB+zp5n9DzldsqLo bbFd2odYVJrd0ztgabUHwpZcjKKw X-Google-Smtp-Source: ALg8bN5k5rTRmZacMNWGC9uh9QHISBK8lVfdZ4qG2CBz2KN4w7pmjU9P3B+37tt1dcipTtXRYxiUKA== X-Received: by 2002:a24:648f:: with SMTP id t137mr9750867itc.176.1547801174005; Fri, 18 Jan 2019 00:46:14 -0800 (PST) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id b25sm1477777iot.10.2019.01.18.00.46.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 00:46:12 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Jan 2019 02:46:00 -0600 Message-Id: <20190118084604.82324-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] lavf/tls_openssl: disable obsolete locking code on OpenSSL 1.1 and later 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These functions are now all no-ops and locking is handled internally. This fixes a small memory leak on init. --- libavformat/tls_openssl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 7ae71bdaf3..9dd53c6fc0 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -48,7 +48,7 @@ typedef struct TLSContext { #endif } TLSContext; -#if HAVE_THREADS +#if HAVE_THREADS && (OPENSSL_VERSION_NUMBER < 0x1010000fL) #include pthread_mutex_t *openssl_mutexes; static void openssl_lock(int mode, int type, const char *file, int line) @@ -72,7 +72,7 @@ int ff_openssl_init(void) if (!openssl_init) { SSL_library_init(); SSL_load_error_strings(); -#if HAVE_THREADS +#if HAVE_THREADS && (OPENSSL_VERSION_NUMBER < 0x1010000fL) if (!CRYPTO_get_locking_callback()) { int i; openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks()); @@ -101,7 +101,7 @@ void ff_openssl_deinit(void) ff_lock_avformat(); openssl_init--; if (!openssl_init) { -#if HAVE_THREADS +#if HAVE_THREADS && (OPENSSL_VERSION_NUMBER < 0x1010000fL) if (CRYPTO_get_locking_callback() == openssl_lock) { int i; CRYPTO_set_locking_callback(NULL);