From patchwork Thu Jan 13 02:09:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33532 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp46781iog; Wed, 12 Jan 2022 18:52:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJywNyMI+xP0gUXc6vuqVEEM6QUt76okFtYdQ1G9uiUZ3kaI9HIZwg25QOeH1gqLJM3u1z9T X-Received: by 2002:a05:6402:5107:: with SMTP id m7mr2343626edd.292.1642042323426; Wed, 12 Jan 2022 18:52:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042323; cv=none; d=google.com; s=arc-20160816; b=DWJEF9iyI15kVJ9EjjxvsurREdANbGqbk5aQvexWJIrv4XW5DqY7E/lFeCLJQygYRk 5mQ2np99WyWpDIB8Go05gDmIFtnG+CzM2W5ZQzDtjIDkDMoaJOq34x/KU4Ck4zvlC/K/ hdx/3Y6udoXYOvgJV8fQJ88DzrgC+1+2ncj2rCrmQrbHiRvYcm1CAlD37SS9lmBMdPG2 NhI3js8+R1eCNLDP+mtYUyrzbAIyar5gigmr5HMDRqp1t+lwOFUiWiD2uTGtmu7dbd66 rpT2QY7XnOR7wjIbQu/WUFPrIdEgILS7Llo5sJY+6aE4H74oxhOqM884SRRM+jIRJoWc Oemg== 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=bRwojEUn4GxDc4RUSfvdPYoQswRd+eZ2/UDP8U1L5PU=; b=OS/fZiUEIGXizoHmQ6i8U/NDlkUyvZNO/C+onLOpYqOJ0CLv/c6OuP7fJI4ToAUHk5 mkJVpB7+B8igfEOunRGCzO+vHzR99xJI2WO22vroCjJhGMDjbyaAyehbRvRQPyYOlodJ YcO6OevQfN3uZPQs0bOIqAGuhTOvclKrnhTHStGqpDvnLjcRkirBnBERCVT9vkcolK0J jU3tcEaBtdnldD4tM6H3N7kWLQ5oUvyMS+WQdCILRKMMuhtrMlRb/98uPTADbhZd3eZB IcQeAzbH2ajIkEDim2ec9JvNwb98hOQ3ArY25n6es8B7NTygVSG02rBwugUiokoiC8rD TNMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Pk4a+6bv; 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 g9si529952ejh.228.2022.01.12.18.52.03; Wed, 12 Jan 2022 18:52:03 -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=Pk4a+6bv; 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 D8B0F68BA84; Thu, 13 Jan 2022 04:09:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37D2768BA78 for ; Thu, 13 Jan 2022 04:09:30 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id bl18so5599750qkb.5 for ; Wed, 12 Jan 2022 18:09:30 -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=oyW7VdXQE3HXmRFaNd64qaUuQw+78e/nr3OHX3CZcVo=; b=Pk4a+6bvIEaJx64zQMqmJpt9IxgdBiT2KF1TV04aqdZQL6JxyZOHRmaOaBEQkb0it1 r8cYbxG1atlhGcKtzKjNvYWRxEXfWm3FA2LvfgUvdNY1cGZIKdaR9w+3LFYE99BR015k CQdENgKWS0lcyzcELhs1j4OkfQNYS/xe2tcGm6WhxNMMkVxZz+tQ7AwZ8QtX67v+Pg5y 7OgSvvhZCbDfB8aN1eCQkQvdzP8aFeRaZDMalTkIAizdy25oGCTlVfQK6OgXfkWw0+AS VzTgEwJT20KrnyzRaXJn+NtCPzFh7Nqfl87H4gS75zCT8L+xWZ/VKPlzYl9C3a7jAIvU i5wA== 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=oyW7VdXQE3HXmRFaNd64qaUuQw+78e/nr3OHX3CZcVo=; b=dK+ur0aNHMVmX+8jbsi4mSiq46UTyn03/bmjbo9YATetjimceMjqNf+qVlGmX3dqzR hYAVVGl9Za/SUFe8qtCU3VdwsxjmHT8p3VB3hbwI0JlBVLwNHlOQ4ZnDZoI53T/Thouj l6n0t8WrTxyqT/NJj2RkLMJsanxWNwkmPxTrct1sxASZVjE+g28E+Z22WNAtB1+s4HXA FsUhZ+bdYgkQcGLEcG5TMrJk2KmBVaC3NO/bO3SPh6go0CHPBRybD8AFiy9EMmXZn+wu LSEm12WLDVW1RefG4xvtu5hWMg2Kp+LYTqsV5B9qq6BsjjN1OhbSmAIbqZXj6Qi3vC6x Ik5w== X-Gm-Message-State: AOAM531EcJIEt64jG//itYTyM3BCOE8xyzpzySyrnCtEjhVAuMlZBVRu LQkEgfEwDDCKcLAagmiZeU3zg6tzHsY= X-Received: by 2002:a05:620a:1a14:: with SMTP id bk20mr1881541qkb.394.1642039768866; Wed, 12 Jan 2022 18:09:28 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u6sm1068031qko.83.2022.01.12.18.09.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:09:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:09:03 -0300 Message-Id: <20220113020913.870-2-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 271/281] ws-snd1: 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: KnWNbciTB+MS From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/ws-snd1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index aa8cd0f5f9..cd16445935 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -43,8 +43,8 @@ static const int8_t ws_adpcm_4bit[] = { static av_cold int ws_snd_decode_init(AVCodecContext *avctx) { - 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_U8; return 0;