From patchwork Sun Sep 4 23:30:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37664 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2306759pzh; Sun, 4 Sep 2022 16:31:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR68Q/Pu1Zccge+ppTWcJukoRK7WJPRtINIySxAqosJHau7AWfwo2h9PWbonjyUtjJu642Mp X-Received: by 2002:a05:6402:1745:b0:448:116b:12fb with SMTP id v5-20020a056402174500b00448116b12fbmr34905792edx.421.1662334262824; Sun, 04 Sep 2022 16:31:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nb1-20020a1709071c8100b00730d36cd631si4831879ejc.816.2022.09.04.16.31.02; Sun, 04 Sep 2022 16:31:02 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=avhSo6px; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01CA868B9AB; Mon, 5 Sep 2022 02:31:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2073.outbound.protection.outlook.com [40.92.91.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C49F468B291 for ; Mon, 5 Sep 2022 02:30:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QKGZW7cPKPonoqFAi94aI8xP4CPTjv7I2voEQ4A4LmXTBPcXiU1Fa5WNmNPvGSzGN8IpRaCxfKNSZMUgDVFdtqI3uaM5dTqFVdZLm8tundcU4YNPkaaY6Ithz1miClJghQE8hhHwid9LJ9TNZde2HXifrSsgiODo0dXjIzVL7Y1vyjZnZwoFy0bwBophC+5huFXvVA85sh6oRtNIrPEADweBOvKhQrOFdy9xYmkPv9WashG5DInJgD+RE6gmyMJwzjW5umRdlW9NqsBpPvnS+jrLHpfrWX77rwUUVImbodHdyOrvAgNmI4oQ6SIU1c5Nva4BH5tisvj4U8LUBgU3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JEkyBfa6F+a3ury++ZkXcbtZld9f9cLoyZdSSaYPnjE=; b=irbu7vFI2SybM+C4t1J9FdDRDIDZ1EMjLxwhG9AE7jaVa7RbeUdcbhWDEne16VLk50qIl1z7x7o6LkrKz1XRLKZkO3E3DiyYk3s4ACWxhrVTXkGhCbjtp1MYGjJtF0/AWtJyTMil7ICKK3sFYGK2XsqgAVCugsIR02YAgAcUnYrpiC7xP+xadTaw3WTEdvKcjVoM/wzwKqhNv7qvbiwLW5N2kkJlRWrRrcPJR5SHjvT4hVmuss5c06z8DtoIAWpMYlNqExbIzCOts9v8o1O/gT30A8RmiWRzh/WU7XZSsQU7CoNLHaeKHv1ikJB+DZQS/ebT/Oyk5v9ZTvbtR4uxKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JEkyBfa6F+a3ury++ZkXcbtZld9f9cLoyZdSSaYPnjE=; b=avhSo6pxPulPZMRz//jqF2sRS25zVAz2OcTdiQBWS6ZKBERG8la+sJDTVyATDrfTAmb3l3WCkn1hqi30tMlhUvCnkbgDsCWDD0zZGds9stYPgE4SmcjMxfToy7X3aoZfkFYBlhGoea0Junzj2q8Y+YcMF+5RKN3oLtd2YdvP8aWwTLOzF96A4YjnfwDGRXNX17utiEtqP1/qllcaHhkt4xju6zVHZq/cD3bvZUSB7xIjFY8UHH0X1lkRHzySPO1vloZCqfFU7WLscIoyUh5qFPLkiwC7qj/n1JY7vhZQ3Dc4NfpNcfgBHqD3H2eUUIzKkK+yc9EGv7CUcSfkhXTSxw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0011.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3da::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.14; Sun, 4 Sep 2022 23:30:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 23:30:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2022 01:30:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [s8rOTQEs3oJDpOxO0ThqaO58KN6o0RrfBKfzagCJ0aw=] X-ClientProxiedBy: ZR2P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904233047.4183832-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef9b1baf-18e8-46ef-1368-08da8ecd81a5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpOESH07gTfyFtwl3n8uZhuAYczd1W8OVDdED5nGHI3cI+x5yxE5/5E2/zjMIhsCb/Ya4JFH19BIYVSlvMddhVzA+JrzkW5ZGGqhpE4HC5k7RSMmoKM6/NsXIJoBJJLyMVOkAS2YRM3jiEHRkOwfh2Nmrmb4z7hIAtRlUZo2rkwXQUlMOXm60jasJVLTm66PPQYQL4ULzwcRRKoKgh9Uiva8L3PFALiCbpFmsG0PV+mWZvjD7moBQ5hZzgeFv1XfWlcX9+/xMLo4da9k6tNPGmsbc9rdpMVAiS3rejvmOFGn3q8fpph8yMFC5D2ziwIBVydisTLkzr9MbDFEwQ/JmsRUlUgVFeEOEhEqXUbf71E6Mt3aGfKTRezTHG2utQu0dNsuDMTWR13BHEdKs+61sATEKW4lzD3bC9QDRLa3ce/kMl4l571GRlOgdPy9P+0AXwdwhHjViOkiAhSGSZvN3LcZNdlv1LElchQu+B5bv616rkvvIZxvNmqQZVVSotZvowDk//GW6ad+rW68rwg62L6Zu/KSXuVMLefkUG72UtdBeEDa1EhBaRaMrHGkWrgLdKd6Ui3pSz3VRYLybdfzT/i057bvzNUXi/9N9QTWeD7dxGeRgLu3eBMJsChx3oGSNxzacswGTLmkkJpC0NwmFD52h3i1oLVGNrtX00isRBDq1439j6aU7doipxgz1WUjaJW+c0c/bOTT4gopW9X4Z69I5RmsuL4fZ13EiZtwn0O63HGNgrfVWRCiAdvuww46to= X-MS-TrafficTypeDiagnostic: AM8P250MB0011:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3L9dRYAY1ulFA4F89GJiVrTbUWrFxVubm1WJngTgrMMcpRPTQZm1dNrhJhVBVdkYeHsC/BVlvJHdBhzqn99U02zkIkOGA6cYCN4sIgHCsETLfrqBYv4khumJsHlKZAdhmmBf0nTymo4lLc3Sy9E77QN5zTRKVgISdFT7XayeyCNGfV51l2QgDxoNNwYfBTOF+jJdxyYHOkD6XVhBCP3SQyT44zK72PEHClrXgaD0+cW9QyLEuSpZbbuaAVwkOx7u4mHLbNbSdxJKoE3bIs2RYBpve7F7cKbeXutqZepVyf9JDJ/E/ap1ZkPnjH954PWz+AjT97LeKJikX/h8e7cnUYlAXUuIp1IWCooA1ztJ+HO9RUAiEYi4JeOAtiyBSayBKQkIav7erac2EwItycQubzhnG2F/TYT/ML7VABzRboS98lmWpl3oSTkD1EFbza8YpON/64TzrktRINJHqO/O8kZNsil/QNX8F6mg2sBoSTFHZ3RwmkDeuKkXMTjXktiSOdzi2d5VIoXbLjzo7NIlz9NAc88qRUZVVvHM1PlevJZBs9ck30qj/MhY2lwmc91H9yBME8id1U7EFxyDx4iosvv++4H9ZflhnL/p2hC58tSGJZc8LNmv2TjCNZ2Jws9p9hdQbxnlpjR7EBQkncztIg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yzI586TXWuxTLSm+b77WZPX1fAPhi3h59C6APaqTWVxX87RohXihmU5jwNolnsDU+iuLcibFheSOPiPNqklNHxFP3gVXWj98goEF+sjYNMTOIE2epcHwfUe43mrSFWYiNoWTlhP2m2jpMdAaEaWS3TWVHthBt6KjuiH0tPHJHK3Zh7xCeKmTMl8Bbs50SScH4tV03X2Z0eHu4rPsyyrdN9yMMMMN2N/J6MyVrGzhAToUnFu++cfmN/zC2AziRA2PYKNawtuBhouRIGmF8QRn3MCUsEEdtpj7qMsa30vBB8WwU+n4SDQLyE9DgsmciBHAnQV6vgu2xM6Tch/HorujJyznBkXYQgjQnKthxGq0CemUBUJ2G1mwow/4eFEDFhArpHm+DiZLplmibSUxQiUWFPiQ4B6DBhrtrLW36epz9ua20GbrUSbGl4goJUvrtYRoogjfrD7hTmZZfe+tqmQMxlxSIsL1eWWazT6s6dtxzAaJIsQvak5hTiKWXVVw4Hi+HASIlyIlVMeBQMdV1gdl8PFmOqJfHx6XrtCSeK97fFYNwrTnvwHA/D1jDTS65ePONrkppcc0itieTH0kw6vrkO7CbudVHOyQnOHchcPiu6tulIMlEsmcMzBMZGpIofhHBOaJX7IhZJB7CDZ4niUWlzT3m8tPg9i71H3h5D7SWN98NTWSo1nV1RWYzYpvH9d1pPdvilTBDBQv30RRCetu7rY7iBwzsROeQ/+0EvlWfkFrkqB+lhIZKtDtljQC5LynFM6hyLkEMTb4qWDgH5SDJ+2qaVQtQuiEJGSfhJ6o8Ty3QT7CV7GgD+wIf51uAA8PZsoyR1FQyKZeCytGFVJQvjWEL+B42Q0W2gHXA68ZxntgBaSBXOnvth3QpJY4DRTQlI4t8Oy93eBftCTY1VLUjlnbH1aZPADkWd8Xtr2sQnYet1mMScLddH7VACoDkjxK4e4BbC5A5H5DWzwcELd4nL4OdhXvYZnNHmfQfkwvZT1Hmr6MJYG++GJxSh7iKK2CVQHtNDQoKxj1d2PZ/YPbK0B5A4lIZR+vHg1gFh89qaCbLYj3nEjOnJe+566FjOPPFBLKRcygbtNSEC8RkSyOywFmn+3hzAOJ0oTB4CWK0FUkLL/VfQpWEgiZV/MF9g0G44k/xKZmoP4r01HCjDsPxg80sd3DQSF2ZITLnLqobUQLsYQWVSrRMSQvoEKTq13tB8CXDxmgpKf+/CTxDaHpaRU3tidHoq/n7EEADZzn5wnz4OtWsmp6dbxsIioUKlpW14en636mHs1nN84jZlpk2vtKWZZhCOoagIKuFAJC2aXsG+HY4ooCd9k3yPWjL3k0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9b1baf-18e8-46ef-1368-08da8ecd81a5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 23:30:52.3052 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0011 Subject: [FFmpeg-devel] [PATCH] avfilter/avfilter: Don't use AVFrame.channel_layout 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jmmtBVMNvUHz Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 965f5d0f63..6740339808 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -62,7 +62,7 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) } if (ref->nb_samples) { ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d", - ref->channel_layout, + ref->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? ref->ch_layout.u.mask : 0, ref->nb_samples, ref->sample_rate); }