From patchwork Thu Jan 13 02:06:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp43510iog; Wed, 12 Jan 2022 18:45:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWqEdvKRi+pgJHb5TcAlc/22cmzoxkb9NOhNQNHY1IEcQ9iI7G5W1BWYPq3H/OrxYVvBa+ X-Received: by 2002:a05:6402:40cf:: with SMTP id z15mr2297195edb.185.1642041931602; Wed, 12 Jan 2022 18:45:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041931; cv=none; d=google.com; s=arc-20160816; b=a0/aYZEb278ZJETxooiukvkBfY+PUpLYshosNFjdQeBX544iMuz/YWYOqdtkm5U1zJ Q5pUWcwDa2uXdPy0KNOjrSWSDRbvFuFXjxtsb7mfQyz+Hq+4NHry0yna6kDqBTakSGqy 4j36uaiRof6OEGe0TISIwtjlHJRcDZOJ5EeMXqyOeb1G/g2+sXbPJ6OHHFxCxcY7oNl6 4K+oj5esvjzQy2nnnt9VtZGekc9yOxKzTlox4lsGouwj3Apb6/FpfD5Dt+Pn7HFHgrIp JCNMYd3I58tqBTnRmn4mSQ+5v5VbkL4HPjJFxdJwfoTSEBkRhSJ5iFmTDtoc61+jjSJL Hlhg== 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=1UGnhRCUF4t+fXcdtDi903fdjlqZQxT3GNmliqp7e/c=; b=kUsynPW7vSOeqsJxeKCctGdne34LoerNjXbPrWgvwDgGu7G5Wf5NqdVGgUdSjDsuog sodAOFeTof4mu617Uzwo8TOj1ID89J6KfXx1ToNkDhRB7S9WqPSJLX3nNcuXBm561t79 Q9gnK2unvRTJlXB541ss8T+YQdaTPP8tuUYeHQynXUaTJPHBaNYFWd7PzpQbUcm3dK2K g8OJR377xO91Y12fN0Vof/TPqH5++Im0zNkyhMkA/HCCGtXVrSBDbuGJwHTs1O6BiOdX 2176DxYoDqpDVLdrM6PLY1BXQ9je8HcbGyntvCi6fKqd9/fol6fVHXlqU38on1ShyFGk HDGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HTh59G8T; 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 r10si755173ejy.9.2022.01.12.18.45.31; Wed, 12 Jan 2022 18:45:31 -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=HTh59G8T; 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 178F068B97E; Thu, 13 Jan 2022 04:07:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F64768B95C for ; Thu, 13 Jan 2022 04:07:34 +0200 (EET) Received: by mail-qt1-f178.google.com with SMTP id h15so989155qtx.0 for ; Wed, 12 Jan 2022 18:07:34 -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=5qKjOmAub+QH67Q7khvf2Xwmgq+jAuWcl8KW4KyKt0I=; b=HTh59G8T9jALEJ5T6tPqvwXpcd3MYCkWK9o/SZEbfyYmCwcxDiHbitzzG4jfseWBB/ J4HLSlQYdpI7GngxggzudJgZs7UG/NVLG43SRh/da9ek3IVciUVlU5RFHaJPQABxt8qG aDHdoxlLXvOdhOE3lvc9uk/HKp7IU0/bP02oXpc/nkztxIsQ5Or5hQdd/FhI2fHoPtvR e/3J8aWMNUmPcXG2vgBE9iZi/vvQmSGZdZj8vr2aMf8tu+3zDnZFOU4Y1OCbLGx0mcid 11j7/N8esntU4lpHG5spD5N1n5Fb5wrYQgBhC4FSxXi3Mh+2pN4uQ6ZTpG+kZvqTJ2Lp x6Yg== 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=5qKjOmAub+QH67Q7khvf2Xwmgq+jAuWcl8KW4KyKt0I=; b=OyRhnLqidFTw83q/HnIhshkfOxx28n1b3ib2Qv7JbcXjBl7qS9GwLU+TUNRUiW6bmd rHj6Wcvt9iFrBuBB90TowQS3pE/CC1E8jpqAXjJx90SeC5b1K2MrP9VfbXT5y2tjA6uB 7nGSYQG8f/u0Gkd8kDzOeVRvLLslcTHyezp/AERicMtFc8AgDqw+YChUlFyOOyjUsgoD LaobE8Fr080GKbay5z511XlowLixcOa5SaAp+6hnBMIkW7bbgNXWsbveKDpB2jEtofza Baq8o5nqUzSrk6pZU3nRiYqF9HHyJLBXJo4t7k/QYD7x5wX6msETwqofhAg9etg+hdBP 8WiQ== X-Gm-Message-State: AOAM533Tma1ne78NWpS88wnW1pMYa7tdAuxEy910lAx8ksiQSxSZ1Spo vAgCh2gmz6OAmzzh3VdGqlfhlT2m6F0= X-Received: by 2002:ac8:7d83:: with SMTP id c3mr2014981qtd.607.1642039653186; Wed, 12 Jan 2022 18:07:33 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:49 -0300 Message-Id: <20220113020713.801-6-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 245/281] pafaudio: 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: HzfMCUHMvOHe From: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/pafaudio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c index 969eb7fa97..8d0e65a829 100644 --- a/libavcodec/pafaudio.c +++ b/libavcodec/pafaudio.c @@ -29,12 +29,13 @@ static av_cold int paf_audio_init(AVCodecContext *avctx) { - if (avctx->channels != 2) { + if (avctx->ch_layout.nb_channels != 2) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); return AVERROR_INVALIDDATA; } - avctx->channel_layout = AV_CH_LAYOUT_STEREO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; avctx->sample_fmt = AV_SAMPLE_FMT_S16; return 0;