From patchwork Thu Jan 13 02:04:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp40994iog; Wed, 12 Jan 2022 18:40:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLe0kSOlpRO6kUNm3ZNs92L6ZUWQBybOXbm/GDuvjAIFWQDDUQgZwgzOboPMDvaOYmzcBe X-Received: by 2002:a17:906:3e06:: with SMTP id k6mr1886524eji.251.1642041627232; Wed, 12 Jan 2022 18:40:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041627; cv=none; d=google.com; s=arc-20160816; b=qo33d9uOivpSXSyKGJ0djvbkXAn0QFHAVI3GDbHEBJHjz8ECx4WtNIeoKpS3IZXni0 E1iLnrZDqXwk4ldlGjYRuY3EmAp83zasx1AAQmsHgTqBC/acs1mQ3hM3/1Y04F0R1Ne2 QlE4D6xJV46LcsEsSZqhuLgrppM52QjfI3t2uSy4pP6XfoSsya9IWiosBPo2pUlY+Ifx i815oHRI8D22zIy4i4S9YFHj81IS46YBHahfHl0fMnw2Ky0cicSDNZ6jcnEoz4+vkeUl kk+QdbMwFS5z1KHkkNGlqM+XRQ7yCcK1ObRIAyM/qfzR53leXe/TA0yP9zmtcdYXvY/7 UbkA== 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=LliQemdM1+Ht1uZBXQH/uzIWvBtXSZz0vMpzkfbTbyI=; b=zBcYUpNfqdVc+S5INU/DBT2+NdHgSuDp0/QO05wBx6RfSlixlrEGLyTsPV75HFw9Zq 90Y+Nkx858zZtBbaWbxTA6RBUNDVwMwHSPwYzO+USZvhIySGLkHDaD5rsW3XlH88UoUw 11uqLXipn882IOxbSwfYwGSWJjnO13CoJk6E5wet9WFCHsiJOspxfgUdZUuiQPTjs3QZ 9Sc4D9QoZggd1D5MCcumH5ZJXlinVSjsCsrFOn1uOyi6x0VS7FyxY99k/KTJfPP7Emp0 HKS/XGw2tlk/XJhO0KjObNE/U9B04LHRwZORdGs9vHoFpDIZ+EuSC60fkL6v80klX8y5 v71Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WWx3qTJP; 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 he44si823074ejc.377.2022.01.12.18.40.26; Wed, 12 Jan 2022 18:40:27 -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=WWx3qTJP; 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 945A468B870; Thu, 13 Jan 2022 04:05:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E99668B823 for ; Thu, 13 Jan 2022 04:05:42 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id c7so1771358qtc.11 for ; Wed, 12 Jan 2022 18:05:42 -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=bAFL7vq0gm4TAud4dqvdkoAzwB8fVqpjaTqcAeYcLXk=; b=WWx3qTJPbocQgAKzHeSVonFKZcvHmglEjhpTsRg7Qtg1kcbh9ybWD71IoNKcZpswJt zU+NiRkWxPcPT7vz58T8FlvzeUTSnfMEs3vTsTqsJEiby9CUFUus8Bvh2nXGfHGkQZIB Kta6Ah+CN4kaW9pCdZRA0LW0Zt2J2o/dy+HbQpweSac+mR1W0OSZ2hEBt2Puu0FOGI5k Xga8C7lzMOkdw789xdQKzJm8M2cY1B9OLLCBo5HGHO7QnkWcRjzg03C0WHciSe5dp7Zr qvpO4SRy+cpAXrnuRV35rKqqvnJI3tj9QNKtaBOo6mcNG2yT0U+86DN+U1G/8iKAq1Lr Dbrw== 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=bAFL7vq0gm4TAud4dqvdkoAzwB8fVqpjaTqcAeYcLXk=; b=kd78kCQa+uYvzUAGkOoW0Noi+9Ou9/YrdD8U1wWSobmEgSA5uAhwvRzzXZJq4g/bIZ 7W3lZa18UcUG+x0tVQwRGStpEzQg7THRKVEHcsAnkBlzXsVEl4SCRvd5I+2vTH5HLODB RhwqL/koYg5nWHaPfLpF2Bc75wdwKOZ6fn++INrwRzeRRN+2mv48Xj5qf+AXI+qf2TRn C2HVbIp5BQUXR3UGEtC4eu24zy8BD3SsN/z2LnzWAcfIl/5g0JlJofMinAgUkhp10ebY 3d/wspjT7Sw2bV9S1yGRBok5eq026lK8CqwU6Lc535tYKDLVq+3p9dBapuamtyXrnSwH FxFw== X-Gm-Message-State: AOAM532UX3a7y23poFlH2Lu4rstJhe2LwlFuITnMbvQpJYfprt180sPd 3A7uaILUdbt/2CuZo4VRSS/NQaEaqB0= X-Received: by 2002:ac8:5e4e:: with SMTP id i14mr2083803qtx.646.1642039541366; Wed, 12 Jan 2022 18:05:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:04:57 -0300 Message-Id: <20220113020518.730-9-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 218/281] hcom: 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: QMp4uGN0Pwvw From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/hcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c index 3030e37d46..d30d6402d1 100644 --- a/libavcodec/hcom.c +++ b/libavcodec/hcom.c @@ -44,7 +44,7 @@ static av_cold int hcom_init(AVCodecContext *avctx) { HCOMContext *s = avctx->priv_data; - if (avctx->channels != 1) { + if (avctx->ch_layout.nb_channels != 1) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); return AVERROR_INVALIDDATA; }