From patchwork Fri Jan 6 01:37:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2072 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5627586vsb; Thu, 5 Jan 2017 17:38:08 -0800 (PST) X-Received: by 10.28.20.3 with SMTP id 3mr728173wmu.9.1483666687928; Thu, 05 Jan 2017 17:38:07 -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 s7si82828376wjz.203.2017.01.05.17.38.07; Thu, 05 Jan 2017 17:38:07 -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 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 AD7A668A15B; Fri, 6 Jan 2017 03:37:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6074068A143 for ; Fri, 6 Jan 2017 03:37:52 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id l7so2259185qtd.3 for ; Thu, 05 Jan 2017 17:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=yh7F8TTY58K7HaNvZUvc0Y/X858Gm+Kgm+t81q1LA80=; b=CFVotXLvE4wL1AdNwtSJWRuf6ZMcwA4Jde5TXyuZsv4ssYz/6o1+9f45objhcN73Gr 6tepgqqgp2wBW00neD5LlkjVXpONkt3n5EEHoWvTnEHfCeWDNu8uf8aLgkEXXaUnX2nf wXCFTxF9EE2SEXzAiqp0KZIaqPDn56IwPag1RNTdg1nf9B3iXIZdhDL/4Gn2BPFEIiMR HVfWQPA7Fy+9OoCPm+6uEwwljX4QbXlSTGS7W9OsWz1fQKaB6WmVGVN5toG6NERoqFuJ hdoixVd2qsqGXffTZf2ebxn34e3MELb3CsC1qhRBNb+3rMVnYGumB62Zo0iDDFLLYGM6 mxVw== 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; bh=yh7F8TTY58K7HaNvZUvc0Y/X858Gm+Kgm+t81q1LA80=; b=UhQMTyEKPn32O/6pGjdwU4iFMWs6HgUSsMWw87rV00wzXZWN5d6ODeMwSaCxGL9lWR TQC68rRjvvR3YuN9tjJOOB0eT/AVlcJ63PurnKhnbyZ+oOpp5Du4ZjW85DIG2FjLaBNR +goOtcnMZmjmsmlq8ozWCeWQM4P/tp1/F4qCZv9buYA2YSn2pvKhQwTrvMKnc9UgatEn mLNBgUCfnnCN/bjmuZ3JlXRMgqQQlm4E6L9uTwX4x+XC/jHZBC63hm6ElInWKS1XONEC n3rQ4iPZNWZblejAujKkHAEA04RVOuOgkY3oQK0zzXccbsJnQ3E2jydn4cZxDFgtI+qj VdIw== X-Gm-Message-State: AIkVDXLs8Q6fodlrQ/Hil7eKu9bFVS5YJD6Vy55gZwF4lbjPAaI+4ctLgixxXKSeKrCJIA== X-Received: by 10.237.38.37 with SMTP id z34mr78080848qtc.73.1483666676631; Thu, 05 Jan 2017 17:37:56 -0800 (PST) Received: from localhost.localdomain ([181.22.32.210]) by smtp.gmail.com with ESMTPSA id i187sm49375650qkd.20.2017.01.05.17.37.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jan 2017 17:37:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 22:37:17 -0300 Message-Id: <20170106013717.1192-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] avcodec/atrac3: use AVCodec.init_static_data() to initialize static data 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/atrac3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 256990b..208762d 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -771,7 +771,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, return avctx->block_align; } -static av_cold void atrac3_init_static_data(void) +static av_cold void atrac3_decode_init_static_data(AVCodec *codec) { int i; @@ -791,7 +791,6 @@ static av_cold void atrac3_init_static_data(void) static av_cold int atrac3_decode_init(AVCodecContext *avctx) { - static int static_init_done; int i, ret; int version, delay, samples_per_frame, frame_factor; const uint8_t *edata_ptr = avctx->extradata; @@ -802,10 +801,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (!static_init_done) - atrac3_init_static_data(); - static_init_done = 1; - /* Take care of the codec-specific extradata. */ if (avctx->extradata_size == 14) { /* Parse the extradata, WAV format */ @@ -932,6 +927,7 @@ AVCodec ff_atrac3_decoder = { .id = AV_CODEC_ID_ATRAC3, .priv_data_size = sizeof(ATRAC3Context), .init = atrac3_decode_init, + .init_static_data = atrac3_decode_init_static_data, .close = atrac3_decode_close, .decode = atrac3_decode_frame, .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,