From patchwork Thu Jan 13 02:02:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp39954iog; Wed, 12 Jan 2022 18:38:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwh9PSqGH5qNSL5QeWe8EkW+lUpNu7zUp+8Gmj/k4+bHRl9yw12CdIqsWTgHBdvKX2xksRr X-Received: by 2002:a17:906:1f51:: with SMTP id d17mr1937794ejk.759.1642041506551; Wed, 12 Jan 2022 18:38:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041506; cv=none; d=google.com; s=arc-20160816; b=loUVDQkn7GlGIDpX1ywCRbas/V3i1Y7h4dwLgbo8tCXDsJznLjummePoG/rJJglvE8 OWA3chjGRjBHVnp2J4yU/vELvqe+C2LlOnqSgCrUW9LkD14UsVFRibtXHqQlZfD2jnAm D4FB17yZ2d++eLTKywz33srsDjO5ZOd90s9EnWrHp8L5ayxWQq2OGnWZdN+HWx89wWHb ye25VzoKvAvSnEcgQC2GF3NtCF/+2sY7FYBTdoPllddRGNqXVDMmV+nDpvCAi66u6NmP G2Q7Wa8+apxSVm8AS/2qgv44D8zekZ+d/4XKy3HL8xMt3C/KdSg2rf4lexNPHmT5nmAV q+Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3hWdRe32Jel1H49/m2P/fItI2sFU5E6DgBmwPA/p0bY=; b=CTFO+WzlnYg4gxeWwfioElZbzpYPiWnSOHVUKJHGfgBlLfvUgBFFoKHuxcKh5eUw1M 4uGhQzQwvoyrRKfBt9jTE+8O1CKH7Rq+tweWmF3x3mEHgEzpFzE3p3UsmTLdWJ8sDIMx cNlM3z4oznRNqSHBfrhN0IhtP7wxJGcvKVBrqlT5KiwKDllzpgsVvxLtiPxb/XZPRWGF DaCU7HS7ljykvwSumKGvoTii7GKlITa/A8XevQ6+1PeXHAHi0rUCu2PAJIxXrD22xk+t t1TQioE2SI4Xa6Mn8QreEuQ/wXkeKnYq4wR/wUsV0Rmck3XAfmcSoKVAF/1IGSKYLhTN w/vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QdAInxWc; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dz15si1365923edb.25.2022.01.12.18.38.26; Wed, 12 Jan 2022 18:38:26 -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 header.s=20210112 header.b=QdAInxWc; 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=QUARANTINE 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 B639C68B7C5; Thu, 13 Jan 2022 04:03:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A57368B7A4 for ; Thu, 13 Jan 2022 04:03:32 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id fo11so5093797qvb.4 for ; Wed, 12 Jan 2022 18:03:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AHGJYoSJXxrA6Ph6O+d6c2gpjxgf3LrnzqDxg46cpSg=; b=QdAInxWcUTRXd/tDe+ojiNENwo15LKLMj1zVccz0hpkkkSRU/G35U7OJ8BjaX9ucbj DF/VSRF5yx9x/JOTeu7ZtdBnUATUJ4fIxYfOmoTUU1gguDOW6O6u64/Ev1eE3qQwZjPw F6ZAXXMk60BZOeLCoXvfGxfNRZtLVDw7YDMmiwM29KKMFNQ/KZMda77WjljL19+apYB0 KIVu7q/4GIrY988ikPUjt3hd46pTfvf6CTlvsklNQVWYLQPr3O7BCmUT2Nvz6j1dqYTe NlPUie3ZxS1ooUDlXKKz9zaJB6xtMrsKzCWCvVVvozCnqu116iztvoMWn9Cb8i2g4kZn /kgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AHGJYoSJXxrA6Ph6O+d6c2gpjxgf3LrnzqDxg46cpSg=; b=HMh0wxkdbMLJ/QCv6PuZcF7vDZ94M+bYmXBPRZ8GjcKiYB1LmtJRyoM+nzYs9Ni3aM MOSYxwig+cymAPINOs/kXWroOluzo5WSzAlXbctjvD/zZZYGiBUnKOUX7TI7HLJDEPkg y5e9haKcT+NYho3lo+WmDV5d4c/iEEx34d1Ymz03cgSzqz8XpE3gbRXNo10BmjulP+3r VEAuRNjsWI97w9DdFUKTl6W/koH/D+Vv7o2xJdVsI0ixBWwAUV/W9PhaEsen0smLg/Sa tQRFvUbKCIZhv5U14ah5FmHRMgJR8qlKsdwxqi3k6jZzJTIZQRX0fWERNHK/QbEskC/d hq2Q== X-Gm-Message-State: AOAM532A27zFU5osiSPAvpgEfkKFK2U10Q82NSSBl2rxyrA01v3XFlJp 1iWhDBmqkv79eDlONBsP/tFaTWyQ85I= X-Received: by 2002:a05:6214:27e5:: with SMTP id jt5mr2215041qvb.106.1642039411205; Wed, 12 Jan 2022 18:03:31 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:41 -0300 Message-Id: <20220113020242.661-29-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 208/281] evrc: convert to new channel layout API 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: z5agHTWoa+mc From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/evrcdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 59fcb14c52..a17f3bc2be 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -235,8 +235,8 @@ static av_cold int evrc_decode_init(AVCodecContext *avctx) int i, n, idx = 0; float denom = 2.0 / (2.0 * 8.0 + 1.0); - avctx->channels = 1; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; avctx->sample_fmt = AV_SAMPLE_FMT_FLT; for (i = 0; i < FILTER_ORDER; i++) {