From patchwork Thu Jan 13 02:07:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33521 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp45238iog; Wed, 12 Jan 2022 18:48:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyCm49R/gw6KJH8O6A4qIvISV1ROOt3OLJ6csc21v+RgoPLTsrcX5PYGsHlL2WU/qVpPha X-Received: by 2002:a05:6402:1908:: with SMTP id e8mr2367981edz.22.1642042127140; Wed, 12 Jan 2022 18:48:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042127; cv=none; d=google.com; s=arc-20160816; b=ZjJWOmGTqDoYUkaSa6kO3ELt86jvb0KPppxjm+XdQL/JFXcNKVYEuu5Ish3cIfqJMY PZ4azM+Gs0SnVvuI94ZbM0AHuRskIEH5yPNyg9W13YwelFjg5NjRDGIFzmEo3NdfyWpZ AeFht4L9rnlYfsDyhCDOeByORPZaQrcGIj0/6ok0Y+2+4tplM9ccCp3qBasfjxzuXxN0 QVBwvQKsIsJnYA172S08PKVbTNPygk9fiSlvGTKucZRnajmtwzfJjWL3zBFeLdlMAtLs SSYGJXPZ2lPC/rwMt0dF7O6ec9s9uA3Qzf7VnqQ+NiraSMY+8Z0dnKORIIwl8C22MpHv XrgA== 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=gtIVFkfRB7XSC/pM1Qv51lWvuVsqvQRO7+rlN7Rq3qU=; b=BbW3V/VyvACcbSJ0zSd2J7HB57/Q16M//IfMVt1uF9UdfGOsKro1UbejNCZUxEBRxJ 9TkLHw7qWmEavXW5nMD/O1OxwK8iJXWfXj9n29N4V+Bw8YfAQZrnKjqPvmHhy7DfQtiu Bvr23ddHuUx+OMrrsXyYJdMzPf7y/26PuZlWn3qd8Ltx//hZSjpvjMXEjv5SB8JexhSn o2U/iCP1n8CY+LiCfuJkfOgxFjZOXxqwEtUTqsla5xxjjHpUgS5UNhJh4kdgVQB+OWNY 78n0rd67kQSYLNeWUwpDOnirYv40URBUhPDokOaFiWOVt/pL42Oq5q4c0s/UBmWTTOn5 IEGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SAd6B3Cr; 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 ho33si861383ejc.943.2022.01.12.18.48.46; Wed, 12 Jan 2022 18:48:47 -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=SAd6B3Cr; 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 0842E68B9DF; Thu, 13 Jan 2022 04:07:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40F3668B9C7 for ; Thu, 13 Jan 2022 04:07:51 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id q14so5335895qtx.10 for ; Wed, 12 Jan 2022 18:07:51 -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=v5pgMIIXhC+o93Nhvc6tTz4jGN8jWN9FInIzOJaR8SY=; b=SAd6B3CrtuWz2hlqfCF/Y8lI6hCdYTlwydM16mwATPdNw/XlZS/oc+NFsFeq3mQbLH V99zEq7vdd3MOMvLiPe7XwWGm1rFXeq9vs+/MSNnDa/tj67CFxdVbN+n8v7G9hZxdfoG koGHNFNP6tSQ1hNM3yoVWKmmdC8V0Ao6ODFHJxqwzV2/TRSAdmBU/v7q/tuIGsGOzCKG V1g70dXBiYuLCdI2/4xTzVREhB4FXUcDi0W2HE29xvxdreFu+Krwgq6eygdiRUssJUVV vlPjjR1LtwWAKwJIKLPHiI6cbJfO+RVXedWSajP7bUxRN19KH1+o3IfN1Cc6e+35qnPV w94Q== 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=v5pgMIIXhC+o93Nhvc6tTz4jGN8jWN9FInIzOJaR8SY=; b=w0nbM11qnZZQ1gv+pzEqTV9b1yj7S3L6mw+l3tepttavfw2QVbzXEsYMkQWhw8ab+1 Z1AvgkUvcsQOSAvXUBfzGwnlEGj2MIQ/o5CKQrCxPIj/zGkYOqKwEyAVuClqwEPutX1S d/bY9dSUrx6Shf8w9d09uYFTJXzsLu5XtpobngCRXOEa3JWAvBpzhSbg7w9BGMv1/Kbf SzttAjAtsY8H3+StN5Dc3e/uO2TPYLKWoDKBXAU3/2J4ExxexnpY2XdHDA3Lphdy/MlC a9jB8WR6z9uapUiUPFK716T88tTWn4v5RBtQJsAxGh6nStNK1Qe/DrRGxIXSQPydZ02O H9ig== X-Gm-Message-State: AOAM533Wcln6AsTKJFYAT4JUFpNFx0J6gegibfpqHpSYlufEgT33tgrS 6fBwcjBJXpJzULZbWTObZw5RsLxQ8s0= X-Received: by 2002:a05:622a:390:: with SMTP id j16mr2056315qtx.122.1642039669834; Wed, 12 Jan 2022 18:07:49 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:07:01 -0300 Message-Id: <20220113020713.801-18-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 257/281] sipr: 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: jWTpVvRm/r0U From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/sipr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index a792b22c9f..6c7293b6ec 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -512,8 +512,8 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx) for (i = 0; i < 4; i++) ctx->energy_history[i] = -14; - 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; return 0;