From patchwork Tue Mar 7 09:01:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 2786 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp463170vsy; Tue, 7 Mar 2017 01:02:37 -0800 (PST) X-Received: by 10.223.153.17 with SMTP id x17mr17949037wrb.55.1488877357653; Tue, 07 Mar 2017 01:02:37 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v4si29868243wrb.306.2017.03.07.01.02.37; Tue, 07 Mar 2017 01:02:37 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE191680CA2; Tue, 7 Mar 2017 11:02:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43C1D68045B for ; Tue, 7 Mar 2017 11:02:12 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id 25so22378488pgy.3 for ; Tue, 07 Mar 2017 01:02:25 -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=HTxQkM39pvF7FtEasyQK1VwT+vewhsETf78YqgoausY=; b=tKdAO99W7Neu+iwWRZEEHO5iTaFMmcosGqKCfeRAYTp930mWQDPaIG3BFnk4o/ZKSb aUvwCc6u628SLlOHh3MA/yIuVgsNcxRMMyRqHwSYs5FbvzgalNdvjoD5mfqKWEQcyNXB N9IJASNSB+BsOh4jFnLta0kVd/LmzHnSoBY4j4B329eNQ6YFjuICY157B9fVCv7cT7Hm NHqLMAXM1kglOGpi330c+/EMqBkq+1+T+UUng7PQFhvXu+ifTvXSFWbcV/jBpPCmOP+D P7HHjJUvviWiPw68v/H8wX1NKODhb09nMOMH81t5mq4KiyPFm5y4dW/zugn6kUMVzGFl u59g== 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=HTxQkM39pvF7FtEasyQK1VwT+vewhsETf78YqgoausY=; b=Uzm1+Zje2IUrulZg8lHSPnzd8JDOmbRXCLeplHmbn/4sVO9CTh1arKP7iGPXc6DhM0 EZiXqFbyY7dJCCrt6xIyibKPhviWr7AfE8nQObKIw2VgN5hb26598uHwjyXqZYTiB8Sl vhFYuNMseEA6WhezH6zlrIvcTcLysuPuzmxGyrSJ09jjGa3jRwlsSL1l6wfLOX1Fkjgo BjGXW85l7AORVvLbw/6kIPqqMbG+6ugFHvVDWxLyR0g5crpNOuPzypk4Wv8ZlI4JByAO /jVomxBG9Z6DEV1H3zxb5QDf0+KDrYul2hJ7t1ngJbKTD/wkpF9d0F6D6dp73Opoa8iO YNJQ== X-Gm-Message-State: AMke39nYa0+HLVhOUQ6Zr69ZI2m0Jw4njBllYGbP7fMYvQJDcTD5KWTf+EZmhHa/GQsQVw== X-Received: by 10.84.232.1 with SMTP id h1mr33093479plk.95.1488877343844; Tue, 07 Mar 2017 01:02:23 -0800 (PST) Received: from localhost.localdomain ([114.120.239.164]) by smtp.gmail.com with ESMTPSA id r134sm44360447pfr.83.2017.03.07.01.02.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 01:02:23 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2017 16:01:59 +0700 Message-Id: <20170307090201.11017-2-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170307090201.11017-1-mfcc64@gmail.com> References: <20170307090201.11017-1-mfcc64@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/4] avfilter/allformats: make av_register_all thread safe 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" use ff_thread_once Suggested-by: wm4 Signed-off-by: Muhammad Faiz --- libavformat/allformats.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 35869e3..132e58b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/thread.h" #include "avformat.h" #include "rtp.h" #include "rdt.h" @@ -41,13 +42,8 @@ #define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x) -void av_register_all(void) +static void register_all(void) { - static int initialized; - - if (initialized) - return; - avcodec_register_all(); /* (de)muxers */ @@ -383,6 +379,11 @@ void av_register_all(void) REGISTER_DEMUXER (LIBMODPLUG, libmodplug); REGISTER_MUXDEMUX(LIBNUT, libnut); REGISTER_DEMUXER (LIBOPENMPT, libopenmpt); +} + +void av_register_all(void) +{ + AVOnce control = AV_ONCE_INIT; - initialized = 1; + ff_thread_once(&control, register_all); }