From patchwork Tue Sep 7 09:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 30058 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4492172iov; Tue, 7 Sep 2021 02:28:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9MpIfcUkJItdEyQD9XOuKvTE4n5p/8QG25pyuzz9yiRB3Sn2ribfwAOcyygIQpbb8kkGI X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr18078213ejc.81.1631006890579; Tue, 07 Sep 2021 02:28:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631006890; cv=none; d=google.com; s=arc-20160816; b=JTXSGqD+p8gXFIO5UULuIW+dR4QbpxXwkmJE9Lt/NRJpFWmcwgjK3Tq+vc54njbZUD JTNtz7CzwO7WQyfGeN9WNAn0QxvbRKPo/TdeR/Jpb39S1ywsKgvlE8X9/Gc0sOIQZpU5 pHwswTc6pS5kd7guKaFzFR4EkoBJIjvpsI6M084M+cIlOzk6yUCUmssEZGT7pN4HXYA4 ba1htHiCDZhbNE0BWA4r0SVHEtVyBcNPBjBK4zmT+9LwaK4sDzHqKoMTDXFyos7uZ7Lk wjKeEi9RqT4E9qfv30jfnL5Y/I+nS1RRF7Svjv4dccGpGGW960vnMWiPTaOFu0/h18sw 2a+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=VdnLsOv9QQ5D1mA33H0DzM9+YIgwYBylixxxL0JtH5A=; b=djcMwjIZ2vDvjtzii5JIebNgOgOdZc0zcbsVQta8YTfm7QC2T6VNp68M7A3fZF/vbc 2CGQO9I3WmN7D4vtUPkgVGRlaHrnSwkXt+swfwLr3MYF2Ot3NDHfbghJCkhgXd/EuY+L W2qiBcRSXWWswXNvCL1XpAGH7KHwShhfJplSvjAWLuV7bgNK2IvHOkXwY/egQDqC+lKR 2Lf0qF57rYMFhgaDsxAiApfqYVzVfAdZyAKHivEwFQIyAv8qwGxyo18e/edFnw+Cy99F uuE0s7omf5CRrWjZvD0MyI5vAqCfBSY0PePRGRF4bmWc2eq80WTh8ZBdPcJpP+FMxaXo cpCA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l14si10504629edr.27.2021.09.07.02.28.10; Tue, 07 Sep 2021 02:28:10 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C115668A6F9; Tue, 7 Sep 2021 12:28:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17E4168804C for ; Tue, 7 Sep 2021 12:28:05 +0300 (EEST) Received: from d6a974dc8ccf41bb502385ae671c906b ([1.145.166.80]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 1879Rxlx027668 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Tue, 7 Sep 2021 09:28:03 GMT Date: Tue, 7 Sep 2021 19:27:56 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <41c39184791971beda9e88257d1546ca1c6ac903.1631006828.git.pross@xvid.org> References: <52654437a219b6d23d7779be9a9268d45850de3b.1631006828.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <52654437a219b6d23d7779be9a9268d45850de3b.1631006828.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/siren: decode_vector: remove unused parameter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: W9HIcBB+OAlD --- Looks to me like a cut and paste error. libavcodec/siren.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 93a2d14d25..ccc69aaf40 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -568,7 +568,7 @@ static int get_dw(SirenContext *s) } static int decode_vector(SirenContext *s, int number_of_regions, - int number_of_available_bits, float *decoder_standard_deviation, + float *decoder_standard_deviation, int *power_categories, float *coefs, int scale_factor) { GetBitContext *gb = &s->gb; @@ -731,7 +731,7 @@ static int siren_decode(AVCodecContext *avctx, void *data, for (int i = 0; i < rate_control; i++) s->power_categories[s->category_balance[i]]++; - ret = decode_vector(s, s->number_of_regions, get_bits_left(gb), + ret = decode_vector(s, s->number_of_regions, s->decoder_standard_deviation, s->power_categories, s->imdct_in, s->scale_factor); if (ret < 0 && !s->microsoft)