From patchwork Wed Mar 13 23:07:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp102603pzb; Wed, 13 Mar 2024 16:08:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpMR9t1CWQipdioyfaF/3epg77xAIbqVpd9p3PJRiqvOpm5Xew7tN55KdRqbpj73uidwO5ygYk6M+d3AfWJ7wi8RZJdM//+9TUZA== X-Google-Smtp-Source: AGHT+IHL/gnYsI+pJr8EMp60/Bi1JZibpR6lxUwE/qubCe3V9fTfPR+hP91WVDxCIp5anLplZBI+ X-Received: by 2002:a17:906:509:b0:a3f:2f67:4847 with SMTP id j9-20020a170906050900b00a3f2f674847mr7890eja.19.1710371302002; Wed, 13 Mar 2024 16:08:22 -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 u14-20020a1709060b0e00b00a44c6dd972fsi97257ejg.841.2024.03.13.16.08.20; Wed, 13 Mar 2024 16:08:21 -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=geVzlh24; 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 CBAD668CF01; Thu, 14 Mar 2024 01:08:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2051.outbound.protection.outlook.com [40.92.90.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3EE368CD4B for ; Thu, 14 Mar 2024 01:08:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xy7XXculrTicdPOd0zYaAdRTSa8/bIIDtx+qGqrmaMLm8T+0ZkM+ejQ84cRPhKiAkDw6KfQRTonPpIODPeFruuKYHmdzFrK7A+3yyS9E2UIsPBy83EnZ6mhVY23grl6mMn4jsTwFT0yArgR0hsBb24F+Y8EhCqSSHCnnfKPNgthdJ97aBASROnh/4UrPy5z8jRNHZkem6OZlVEH1A2zsU66rnv6l33vaDWuLds6qrsCJZglT4KhEOR5twBwzj81q+fVbXEz1Oav35wIQGoEKPduXD/MLeYJyiqAx+Zld9dHMZsLae/FSdscKnj/d91Wq8ZJvXGpARb6e1v3O50mGZQ== 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=dZCYCsRJHdFqcJxAANAfHKTfhXh/fUyFtLZcLym8pDI=; b=D9WZk79+LeG6HODenbICjgZiVNf/jdhFk8wI8p+DXMWNB9xa4gJ/VAm/2EW1jPxtPits6fgABtkavP8TEuu+imwp8M/uMiOcMTH0sNW3VADs69qxqat2zZrSsgKFgQTHePFMN8rtDcaXum+B6dVaYAH8DaBwbA0ceEC4+ZKuQXm1/3NHPQxQgU2ruQt1wl41m5MY3YGoIn4n0vW2vyhUieuXWRhX5+M/TOeU4uYSAHm4UtVUvtbN+IcXcYqj4/ooFmDo0W5gmjwK/bH1iYOihLTrtl7tmIqIypsUAhicd9bA4c2kcEXcxf5QY102xPLw8gXb2ZYYHGmsh3ZeDGFaqw== 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=dZCYCsRJHdFqcJxAANAfHKTfhXh/fUyFtLZcLym8pDI=; b=geVzlh24+bJa89ee3Ap7oHneobfRM2rdV8Hu1OStU4MiifeWcxvHz6avH2sDkz97Hax1QChOAXpvSbM0yjvi9Tk7bRwl0GpTOGI36XSp7GNuHIEoXh4T63FSLGs7GntQROj2wkPm+QsYJeXf/bnktNNAC/JfXfGNWhiy6bmed0f05WA9IZQuN2SBP0m6NT1Yy3mDXTiSuxmZWNyieR29ni9NnWWXLRDsYfBzPb19wPRS5rTjrnxHng4qVpjh863RyVl7tc81bGtoKiylFPsuVx8p2DIFHSOhXBfCd7O7x+axnJkB4lkpRBBGRX1yMe8Jc8Cecstcl/y8zisTKuQxCQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:08:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:08:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:07:55 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [qNP7UBYQ4JT0Q5gWKdSuJEQOJf3lQKcyGNP7Hp+2TNI=] X-ClientProxiedBy: FR0P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230801.3058749-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: ec0b1215-e671-4de3-97e0-08dc43b2721a X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrZB07ndMjn8PPzEH1YHAJh8mxV5blWm61k29RJtFmQlyrMEjgQSV+5YujsBIFIC6nBVjyoUSeuebB0iGvf4wMrw+0+Emlj8WTrna4BO9KRbHQy6ebX3oRnEmXHuLO5pTXICdP5tqGQnJTuDaxUNXZiApaLL+lquBb2ZIgQWqUcEVStZEHZW1Yj48voVAtfyy37J+yeA6GNhHcVRZhKN+n7bCsB9iRdmLILBwwjNqqBXPMPM9Oe4MuEFg4ChTMSsXZ4LiNbs1eSCqdFxpyL5W1q650+JpXE+9s1/afOriRB/915hDaXk0IjCAM2czqJ1a+1GYoVmuIT8Dnp6p+7On1Ulv9HDpPUd9ZniABTEkXvf+WAOPhBLOKQnlwVsjtqrrS+AMhzuNmfA77wiLq5SgCFK/PRBQRKl+k8Utwkn+GBAHmHpj1b11G5Mf5jY0omUOXLS/hH4xUffy6xm+qWc2id2QckwjoXVaW9Uc3WqlnnU51bBA81bRv7rvns68+6cTtQ3P7K8NI7urybAsTTsWHX/3etovq+7j6inVaC9pQTM2fPH0HwXuA8dOIwi7duMdNArKWTUpyHm5Fk8RGmUPQ5s03RzhhBIXWocvZ8/RTfp6JL2oVgiwGokrYZZHUOqCfRP55IZ9FD24ZR5ZJHi0fWKyb20xFGdbV5wcZhL5MCEdrtw7j3fY6GD/rF2gdlTqNqdRn7agFQdXbY/eeL/rz1aczgVWkjrDdq+HiobYExtNBwsTLSJ5tsxdF0+lglQFM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: edgdfGEQRMY95ZAgCky4sOvwOnPAEVk+MBrtwTkFB9nz5997eZPoS01ZRfdXyP6u1p1CD3SyRgVNSvVI4W7M4KhU6H5CE7+YVN2d2X1KzXsF4H9mnPXJEc7ahVc47TpSAciFrH/WrBUvjWgr63c7BOjSJ30ykUhJ4NKrvix4oea2ykp1/OgOGAJsagwd3iYBHAT0GIzG0BESwv85IdYmZ3Nc1JRl1AqykHJlZWMtubrWG/5E8TEQNdp41lwIdIicmPTPkO63eul6Z+62K1YNktfkb0sttRP2WSLuoSERcasYUXM/IHxSH3U03+agntLVARdfjvhmEbtyjvwwLK6Fj5Gu1snR0MJ6mgUt+qjUXp5S7tbocHOAoU6W9CWX7VyIMyK3s7wmcTrT41XDZWgnncxf14EWbsDvkZF23UaqEvyOTehjZ4jxn6pNTSiB7YD2LstHZe5rSul9qkMVf6Lc1t+hJd5VNP4ya7csEQgrQKu9rqAkveGNVBFjKcX/v6z13gINxZTnVOoGlqHvnKD9k/kCR8q57LZwTwbPsPQ8uTmMuhS/+6iA/Sh3e4hfcPhPX2HMAjSNv6t361Al3CqR1VaduzCu2iNYN+FUIV36AtupEKmV11GDDOky0NvviKjW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QX8p5GqspeGZn9PYXhWXoOeRyhcDOcs8+0FjU/GJj2e/XrIVyJewLgl+PBZnjARFH++JPAULZcM/0WLXVXH2wBG1/adP9v4+qArpM/Y0siv4L5DctLeyuZ+W2S07kJsXo60CIUHHZGwHeErgGnHT/6w8vn5d3K0Sb5HwdxpGE4RemkFRC5aoAe07dlAZJajDR6NP5u1EjeAoJ+JjDtUCrnpVcq71Bd1LwChb3djojwy9LpR0H50nch4afatRRR5M0GWMU67ziEh7rvI6L7DLed2MWnOIFnwtSjZQCAph2prhN+wMDVTbVO/e2TysuCUDtfNcicGvmuHze3Qfc9lzVIA3maRZqK+fwobIH2sj5g0M+p7cqc5jrkgvwo0C29YrGkO73FZyP3yMym3er3+enNlaIaMBQNB6N3WlqtpwPqLBrVpwnDrN9iTMIkTOCh5Oh9bk1KdMTmNAW00wX0lWk9QFRr+ur0Jlmx64b/4kIvP+acKegywaAGihfTXohV+9nVkdg8tXxrjiBzNG2QLwBTdpMnmCKg4a0KIdLNv9TOu9zKrKraSnuh4MocY2wPz53AN/K4f9/6BAmzUK7l+PTui2pkE+OhpfIOGl6ziSFNsSn3vlbjLxvKDIYCZ825FmdY7YZASHiOEZn8YUhS5DKwNw4/hPvfi/0WH7rKm4pW7XZGjNa2Y0Jy5PrBTR4jIHVgwlt7Sj/pyoOHH5Nhz6fJoqOe2WYJcfImfbvH7eMexbM+er/hXALz7Fa7nE006jJF2q90Cx2u+c5iWJgn1Ct7b0Zbb0daPuZ8VdcM2clG1KtZ+O6+3fNhqh6j4lqgY3RcGGwj0izgr3MEEFjouyQRTIsTND7/InLVc292iVT+IR8RNl1O9y6a87gfuTqObdjQfgw9YPwFHkty+ZGAR3/Y6VQ/oZHTiGLvGTwnHKzlxeGXI7+FAG6t7ajZflOkmPJHN9uPnT3s4odEFdrIO1J4u71fhKmq329yYRF3bmxc14yniyFffDDUKslTqe5jPFMQvESKQV7Wqe3MJAICdcgUeVKs5RfUtLvo+mFWnL97uIDno2A+dW4yb7ulIS//I2QjitooN9JmV7/woaGJAbqo/0erA8XmatQcO8/KykGRaljQkGUaITZVF5drRIyBhXK83xUqPKorDNkyzRnF4DmmOGoqBcwrejH5oZslIDwbP0nt/Klag7DUy0ZL1h50gdtA4TeLsbyVgFfT+wnxrfImPT2+9Jvy8RmhwS/TyCjZsVFMkDIlrO6+4LFDv7/aBCRRA97Nsj2rWR91wMKNSdNw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec0b1215-e671-4de3-97e0-08dc43b2721a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:08:07.9606 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 1/7] avformat/iamf: Mark symbols as hidden 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: 1EQJolQeN85U Avoids .got entries for ff_iamf_scalable_ch_layouts and ff_iamf_sound_system_map (whether they would have been created otherwise depends upon the compiler and compiler options). Signed-off-by: Andreas Rheinhardt --- libavformat/iamf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/iamf.h b/libavformat/iamf.h index d662f6e76b..68f05c635b 100644 --- a/libavformat/iamf.h +++ b/libavformat/iamf.h @@ -25,6 +25,7 @@ #include #include +#include "libavutil/attributes_internal.h" #include "libavutil/channel_layout.h" #include "libavutil/iamf.h" #include "libavcodec/codec_id.h" @@ -162,6 +163,7 @@ struct IAMFSoundSystemMap { AVChannelLayout layout; }; +FF_VISIBILITY_PUSH_HIDDEN extern const AVChannelLayout ff_iamf_scalable_ch_layouts[10]; extern const struct IAMFSoundSystemMap ff_iamf_sound_system_map[13]; @@ -195,5 +197,6 @@ static inline IAMFParamDefinition *ff_iamf_get_param_definition(const IAMFContex void ff_iamf_free_audio_element(IAMFAudioElement **paudio_element); void ff_iamf_free_mix_presentation(IAMFMixPresentation **pmix_presentation); void ff_iamf_uninit_context(IAMFContext *c); +FF_VISIBILITY_POP_HIDDEN #endif /* AVFORMAT_IAMF_H */ From patchwork Wed Mar 13 23:09:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103320pzb; Wed, 13 Mar 2024 16:09:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUktO4KPxnw55K7KaG2Gx+Y2sUD4ciY3ySqCVCC0gHGDlNGD3T+zTE/7j3PQGKBnNH5UW/RYsfc0hKQ3H9CqAfRlY78RylfsJeHaQ== X-Google-Smtp-Source: AGHT+IFz7VQPCfOnGQ+p+dfNZjyMhf+GwB8sKIokzT1S24g43FyDaPY+DM3+0sYySSm1OF5PyNFM X-Received: by 2002:a05:6402:910:b0:568:9fe3:6ba4 with SMTP id g16-20020a056402091000b005689fe36ba4mr25262edz.42.1710371395421; Wed, 13 Mar 2024 16:09:55 -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 e12-20020a50a68c000000b0056871419d13si109741edc.172.2024.03.13.16.09.54; Wed, 13 Mar 2024 16:09:55 -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=BOd5B1FX; 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 18DFB68CF89; Thu, 14 Mar 2024 01:09:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2066.outbound.protection.outlook.com [40.92.90.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F19568CE1C for ; Thu, 14 Mar 2024 01:09:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q2HN20cBpCkv4zpaBZ3XajD4R3YM0kjkmH0jBpVQ8xOOw6uLQhmfS3X99PMD6YHRLp2kMyzC1rdAfLIxdCY4+HljmffnfAiymmurTPSzEQUjumpSKTagag2ZfBuupklRdy4v58tRla7zPmo33xk4xNpGvYDy8R3MDqnD6gC2E3SlIHc5MNADaldofEStqTbtY9YhL8h1ciNwFnudc5e8un5Pl4gl8et5Z+eiJnxAnfhEnmoGidnjTtJHfZk9ONUTVMq6YtrPDxMvGj900pbdhVErSG+2OKPxo9SJPEbFhQmHw0mIF1+lQNgG7ao7Y764v4yWST7VmsD4g9XXdKAhXg== 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=QnGfxm+di2IyZWoC9v8DD6KKq3d3VFrHxkMlz1BjGgI=; b=f3hoGN/ABxLUvDGGuR8fPHwqtANyhx/9RdUSitd+RI7M7AwHT8ESEcvCbbHA0A5JuJHu+HmqcSJ8F+gO1qLDee8QNehKzEzTvfWCo4PJO7k6dn1vxLTr23Kc2Fx/TPV0KCyEyQdNjFSjYB2+LL24MXxlkoF5ZBgBvphH8HahWxBSwO/gU+xKtx3tvaUV5PnzwTI67INJEl4KT2by3mQh9D25E4FP1o3mFFkNZejR7wSVQiAbOBHKwnCw7sFQX0qdUXlv7Sd79qPhGGnePmt37NXqzAiHJa4c4kaQZrCgA2rqnSwPDQGcrSabuAIimsXkUxBYb4+NvCw9zPGcfqykOg== 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=QnGfxm+di2IyZWoC9v8DD6KKq3d3VFrHxkMlz1BjGgI=; b=BOd5B1FXVN1n4a40YcKvPkTsQp8/pkmVCn3m7PHpdcvWknWoq2MUEo4Z/h0kPPB4bDl14ZFsPDxS3z2CgfhHp7SqKd/1qetCHRPw/Ojmbt2kyW0Jhar5oURVzjd31II8YQIwe4Rk+DSUAsXFCB2u6w874OQOnwxO/xcexizn7vMAqnVwp9E0x3O7Bcc3rRZ05ikL3fuK1u+434sERqUOT3QzbCvqm7PGnLAJa9VljhqCab3/3L0LNQORXxMctsdSuBVC4zLZFq7JXiUbR8XriHMlNHm0Fsm5bIiS6pxtOPZwmEs6pqi+t2vKC8Wkf9tcngSzdHcNPwXvvkWeEq03qA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:09:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:09:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:30 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [vadMRuV9YTnRsw59Gda4BwaH6AHMmB3+oE/qe7c83Es=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: 6887649f-69f2-44bc-71f0-08dc43b2ab0b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrZB07ndMjn8PPzEH1YHAJhg1+13hexcOc96AlBNw79tfBxngIFNC/f5DD9MdjVJk3QuafrQdN9hCBwyK5rNO2OeFbsaAjTTPTgX/QOIogbwYuaqnkzat+zQlu8tzdbGBySuakrpEieTpw6JF7s8BUvsi0O4wdWzhEIO33WdL50kickocxEyYkx0ELemggWzaGPuz8Bkunf5+1cG6SCuENKyecjwvk5F2BG0GEweapgll7KbdJIpw/aov/Aga+j4LYzh08oSD3POwpKcxASrgkC4eeA5ax3ZqTjPj+ppxZfnxJ3ho1uk4qFhVOGcYhj1nar9ktAxXcvNkQ2i/tf11Qmi72k7GDsMiPAPL9b5Wq/auR8Ipg3+WYUlc3BWCgUqMavFvYZXYTApnm3oQY+b70rKo49ek2bwVB2qMvrJD127+6akT37NyzeooLXo3Ggmacn6QPp6TDhijMl81NNMQ/UhdeM/B7LJ/OJ5vWd1rpXSCKSnUJ165MiJ9tiss3meDak2/CQ+WJLzM/p/7BzbLWIc6LgUWQoEJCugfvFYV3rmH5p/uFi2f968fv0L96ZcTp80Q62E3n0x6RgnSses0wN+Dz6dsexLEHKH9rfJYB/PPVZwSOM7zTNabd8aivhOymQTtIHQZf8T53nygghG016vcfKy/+4woABg6S68rsWLMoeFEvcxLJNhgHXObNip8BYg8wRtB0eY5bAnntrPHAuDyoDlmKT3bEE1hHtwvlEbq/W2D9slKWwUQ+CW/mXViA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J8uS6Ups5DDr7LYOHdJhnmDN8I7ZfVN0vkPMCAbI/B611Qfzi+hteM9kjnDBrbsgI0b0/600Fgu1YLP8L7GIi7hxaAtsnDqffn3DPGhw3fo+V2lBqYOWMTl4tmNO9g2nScqnmtBqoNAgyJEXdZttmAoJVPWS/0T2IsxGXoeFFCCFlnAk0YTjOGYnHJ4noUF89c7amm0QIzza0T/jhVjCFz2Ip0Zn5Qg/lNhOufpyD3oleV62Cv1VWJxcJI1zyqqPGDi4tUvvZ3Da39bNiMm40lnVYI2ldlxQ8H9CnBbHFAH3U5zbl6/dUVc1zOkLXEA19MWYsMOuYDLXYaaYAmY0A72uDoNp1VewksNFXUnMwOR2Gd3m+xNpXhhU+kR/OzQCoIeYH2jTVhuqc0EK5EcVmD9TrboMSv2tqU/DW+i2OjcaR/8+U6PKXUcHC05ncPJypyt81eFMRVU1/2nML6FW2ut+tNgROCQKAfrCH2Y+rZOiJxX4D8nWZfp9mSTEuyg9L3JAFhHcSoY+rOiBZDtB/ZXCnISTfq6HvMOZNcQTUsvswBCE0WvPuEbuszFryIsfUCKPIBrKLEKjwb+VTEkg42GOvOWcD/QSuP09E+unMnZuL+8F4pDApoZDtvA0PFK6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oB1F175AY9Q375ZxPdwLpS9UZOjpOZg7pIKx03jHFtBcjr+N37G8IpVojxZCzE+8yB1jA2YQjJjvsFxZ45i1cuygLYtuHOt38f69KhpmUhqVRTFh/Q1M4z2rSGQxdHwpQIJRLV393HO3hkZ/PAzTEGSzJXI4gVrzfomud76UxkXgsOZG8rfB4zZLD6yQ9uHfTBrjlWtAUEffl+AopumLweXieHaOvL8G3McTj8+vHIUD4Hc5pVuKal/a9klSJFP0QygIWkRypgyAQo5r0vOUC+Qi8DaeBJwGr/LwVsHVldpFCPFdPg1cjiqON+yjo8Q1UsXndImEyOObP5yhLnaiCuX1AmtuaDIMbRx5RQiCpbwzzDns7oJZjlB5ulRSJLFn9y4WOsxLKJxgGRrhKZBpz/2yrg40qmwDYvajBJD22crurhtLpJTtxxlcKgIm9zrkpAi3q2GDTqgc8zuq5HQJKVmpk+O4+GRXxCxJjzi4PxNUG35o8dYvbWkaI8Os8a1dKg3cSuTVQrjwGIg39+kGOS8ktM2vHzlUZBuPgriZZ78BxBxV2P+kHnD+l2Zprxk+I68k3LLiZhYsAs3vU6CmcetHsBirSq7lLvdEVsr8i0YTg2Kw3ZcYZ+VXKyLCDy/ztYX91yVDENEdBkhgmCtwfnkMD1sTwKZtwUt23heilb4nw5YamwaBldcSSKCIWISFUyXQXlZIGLob3zlX2y33Pn0yTcj/qN6OKURGIZnGNH4wi9a7cing8sXEZO+z/cPvbitr4bqIvV1cDNTCkiD5Er0Sm+V6yb7jXu+akbHovY3J4A1YgC8z6p6EqTHaFhEtWYLVQXj/nHbE87vcmCmZbqaJyZKfQXxGXOESI/5j7iCOfYMKF9zSdpa9E7MGbg/Vr55YJ16TiFsSbKAEUz83vb7j5yStlccug5vR2ZQnH+unJcgkPq1GOMKRikZIhpp4A7N6HwXl0SDXkgXR9PsuOmoKYZWBS2kPbTWpGE7FxRO88gFtkkrdNUwWfLjdawAayKr6YVvmKAjdW6zuqpYhJyNSRAxX9HTpCCBTXwOK6w1s4b3NHrG/7BAQQdUNGHDC/XUOBGYDt+ed+qkAr3fE/gQW+6FbbM3c7eH0fF2JbdkPCxe6ZwjV3nnXB0qC2Xp5UAJ7F/Czk9ynFUhyW6N+AiS8viQ3xsEz3a4mk3q1mdqLJRApMdlYlxDZgSq9TvOpAJkLnKcftO0Q5II3IFfKvxTFqB31Wy4i8vBoSv4tF3pT7LMQSy0mcG/TS/eXjELte0PyfC3pW5ZvKEbRLFQR8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6887649f-69f2-44bc-71f0-08dc43b2ab0b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:09:43.4854 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/ac3tab: Remove enum CustomChannelMapLocation 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: f+03Wxeie9gR Forgotten in 4c8d9b1d0901b0fba0887e53463574913e8862c5. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3tab.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 2531d80677..dcef643acb 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -45,22 +45,6 @@ extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; extern const uint8_t ff_ac3_bin_to_band_tab[253]; extern const uint64_t ff_eac3_custom_channel_map_locations[16][2]; - -/** Custom channel map locations bitmask - * Other channels described in documentation: - * Lc/Rc pair, Lrs/Rrs pair, Ts, Lsd/Rsd pair, - * Lw/Rw pair, Lvh/Rvh pair, Cvh, Reserved, LFE2 - */ -enum CustomChannelMapLocation{ - AC3_CHMAP_L= 1<<(15-0), - AC3_CHMAP_C= 1<<(15-1), - AC3_CHMAP_R= 1<<(15-2), - AC3_CHMAP_L_SUR= 1<<(15-3), - AC3_CHMAP_R_SUR = 1<<(15-4), - AC3_CHMAP_C_SUR= 1<<(15-7), - AC3_CHMAP_LFE = 1<<(15-15) -}; - #define COMMON_CHANNEL_MAP \ { { 0, 1, }, { 0, 1, 2, } },\ { { 0, }, { 0, 1, } },\ From patchwork Wed Mar 13 23:09:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103449pzb; Wed, 13 Mar 2024 16:10:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVi4pNoixfRYRZffgSP9aRVB47XOjE7hpRcDmCWFMUR5OiBqxz44u7eQfzO4+sOoVl1fN48JoIrYusEZYOFpuAgdwS+WuTf9Ct2WQ== X-Google-Smtp-Source: AGHT+IGKLe4fWkot/L9Fd0TFkk5IjRJQe7LCaFlZE7jxrl4nfEN529wJlG7dqfnfJg7izTMxtRT2 X-Received: by 2002:a50:99d7:0:b0:566:47ee:b8b4 with SMTP id n23-20020a5099d7000000b0056647eeb8b4mr3280260edb.17.1710371411919; Wed, 13 Mar 2024 16:10:11 -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 ck26-20020a0564021c1a00b0056750fa2e67si102191edb.407.2024.03.13.16.10.11; Wed, 13 Mar 2024 16:10:11 -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=elpfoRMj; 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 1FF8F68CFEC; Thu, 14 Mar 2024 01:10:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2078.outbound.protection.outlook.com [40.92.66.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E20A68CF55 for ; Thu, 14 Mar 2024 01:10:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnRYa81B0odQtLPg4gCzrO62or9Cm6HWDkWMQs6FHDzAyPOyA5+Szn5mLoBDVwKW7vGpCbJ72CKVxo/+b17ox6/7CNu+G1o7CXIgvZZ2PchvxUK5klKeK3RrpN9em/cxhJz4C6Wb7egk3AqE9xKTjSyn7GQiNFwiUj3VR2vTAHCZ08eiGgwNwQ9MP7doltDMijb/bq3wyKCEalv2CyVclMB80OPIi1q/Y9m+YtVlWH0bf90wlYnifyfY2zzkoibecMgJGSINGwv77NtjJfP8iY77kgIWiKYRMNjkhCtnjEbK/KTXEeIz46XqXEsj7sPDZo8YZU5sQlDa3Om/KxI9fw== 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=cru+c9BMzwF4bhUV7MYtKBSa3turvf1+Po3MdzJG580=; b=gQks7IOZl7LM29c7haVWOmlIj9QFZyKpzgGKzAB9NuH4L2DTBifKUKF+6sV3VzSwxl0ns63hDnQUGltA8WgLJChYeAGi8kMZpp0KBbrThv9OG4nuK3qUe/DnkakJO6uCMqkqsKoRFvHxDWgdwtEOVBnIitMUhmVyXOL84pbZ3IJoFmnjsOZDMptJshnhzXsCp7YMJnBotUiIHPJso5y5lnRII58hu7EJ9PbciY6JGK0/qL0OOHwE7Yt4dOy3QP+LwVqT2CTkeoezRCFORJuTNdLClUxVWXnNVbpbJubJQJqZb4K6v/PolEwxm6wo0ZBHxLc33HsKfmgwMluwbpAhPg== 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=cru+c9BMzwF4bhUV7MYtKBSa3turvf1+Po3MdzJG580=; b=elpfoRMjHJFej4t/3BNDvmmV3o7G0gqzxNAW++SGC+o3lypdcjfTdvACnFjBUyb7EQEcHd2gOGrpTeAnEhLKMVwyzfZLM+L5Zf8e0eRYtg0vfnZ96WBYHB6/2eh0wrfiTd+YvPlTNiKLcCyl4b+MvzohQf/8quf+JW+pNv/pXhPvDFszVdkucK169YFW5xhlFsavaBkpMzHAQeudPv1x9oI8qpuvYC7oXuJnrZqjAITe6SfDv1ImP615B0hkhzIh1cT/3sR4V9Tt+krq5nOXWPip/WMycB/cjJ8n8JZ+FdIU+u7hqWCHuPPrTvY1SgehWoNYz/UdsY5akKJmKtyTHg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:10:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:10:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:31 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [dICU/rPirgBB4Ua1jfb/wbEEUCWvJZ10lhdu6ry7kLQ=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: ea562723-2c21-41ff-140e-08dc43b2b54c X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDyadF/9QYgeT/1Wlu6smXx/Ihk27CaRz3I+FsUFFtDIEWpt3JyYRHA4GhnJ19JtXjt8gOYv1JNhwtwmEMoTZoEDdMjiQG6Xp/nghUroP8Gnnr6fLKWAADkBwGEudG0ohiwMtJxvKy19N5V7O0TI3dbWMp4xnxKtXioyf+kY/srZ5qnFs6n5fPegYEoWANMs86lK7PM4K0+/YKFGbBBxmnYkdTxKH5u2MahNv1dgIJDjvNXKAQFpFq0oRc21hnRq6/UV5zuGKT42/G3PHtt1/WN0eGHkwsyU4iQlxD8bad4Fq5vAAMGRoZkz8jA3plb/AjyIewFgkAJY8Ra6k+kqRCU91mrU+LTBSQAV+Tv3N/JuDxkmceb7eIkko68mf1JRTb9/luZouRMnCt4W9h1Pgq19oIgy5ePRbn/Ln1pJqFau+wTq/SVmBDhvbi12rNdIotvYucjkrP9pQivgnfktF9Om2Qarbj5ME3Do1qrC+YlTc8eB9/vGxm2teaTEOi7z3PyjRQYyOEYXyJDxVDnykNVbBWkIphmQQNed0iexQcG8y9XvYk3KjopitXp4CdWjpvdGvuGIP+QZy7Z+9wZRdp5ctUVsLl2/WDtCjewUN9Uv3nZ4Y0Zq0yTmNfeizE0TnAnnbdvHa3Iod2xDRJpLZXX8KlYs0EW0/nm6Fa6LCNqjWL/shgAIf2OV9Ted5WSvFhe0LMAQ5Pg8IS2pRzC8M5PgNN630fQWOtTgtyqJirFuw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C4x3no7FxgPrQEK+1irwyJREYE9msU8z7TRhNbLixcCYAb2Ozf7R5S5G3ZmerJ3ZW1alJcSozKuy38cXlNP7vdKzgLk6HWiQO6MKJsgrip7fAjEjvkdoQ4KiAX+X0AbhbxnjcrJy0LIU+RjQ92wCWSAFjxweZW2vbfFBtTny18rCC9f0UPCQnhJU+MQY4owjn3I+ZXhOQqP4eS3J+EX+CjiaZYENWE+FP5IV55Ydm+txJBuq4kr95qonXpjlZyj7QFNwm/jJFcYRR4kV+gKfjls95Rhjp7vTvD87hzzmwOf6EcFEUMnFmNKGEveOlTSdyzmHU7atyhNdRaCiZd9hjDl4UdgeUAgWUnPJEA0epvJZqunL+EyM5uqHutwSSKKOwfvCYScpmxgqbvfehzWZ55bkvwwCduK84uTAMSx6GIjuGLp+xcI31pqF3WONzAn5GJJcf70lTwU4/80o3hMj4A6kwiru8IJvS67LGws6WsqKkFK2wdNSXCFsWrdrPOjJFDQNC+cqxgRCdTrzkMaczdap3wpk4ZbDcXRIAvQDRcMKgYxmLH+pG5FGRNur1pH1xTA1kc2N/Hzp4F93pgP7rqO92FweRfMjmaNvU9HHKUkjXtgwrC8m1bHYk7WT0C6F X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UXgXKW5pMuUVrVh8RQqujr0JGvTPd6ZSyuqjWUQsNStAgloVb48nPNYNOxPHcAvEPODq8S/x6iAvf97fwM4dh1IygZiuIQqNOVWoSmNfvNdH9opnA4bREvY/JHr2rXpFRcwKfDRSErizPOiP0XdNGCiJsuhmm0tBg1JD9hW/so/8SDB0V101xp6JXQ01n0ZwrocefuiaM4qwHdMqx0Qs7gxbX1bf6tUVQf886FHQoMO4WiHac8/v015qyO6lCU6T8V7AoV0J/R0B/VYbo+2GQ9BOvTnWcXRQdFwCo4Yy8k4i5JSNKfAx2jOah9mE3sq6/GSvR0mhh1nRUSpVOzOqazYSeVPn1cSUudFwCeAmb42JOFj8rAKVBM/WUv5jSbUTY5tZ+TrW5jDM26v41Mto4u/Ady+R04imFRIYu9CXDgKEIRSTanURrEeT6mEWeAMwrXM6eSTuJCUfim1bz/bfseFjin7soYAQpi2V5ybTuM4vwY0c7od26VN5+POVkknHwIsA8hlwx25UChBDv+iLAq3GDswKoMxLr2O5/f8/hhpujYf838IbsecHwT/Y0g8QVUyrytsi3G2x2D6h1QX+TTgmCVAwEk04/chbnn3BOwUp657NrTcIRxXRQ28mTuvxSf/I8nGhMcSry0IZ17uijq3tqyVMmUjzkiZQO4srAvNs7o+29qCwP8lbyfWhvySY6nEvv8HnPEB2EtAzDLC0ZvhIztpFqqCpHg6gW+pFaUZV9HwoP3wG8dJVS51VbpSOeGUkJWDBw3LQOsQJVqrA/92E+DaZhdwRBGJ7RAHUAAfkPcTlcqsNIs3+/jnxDcO633VRjYlasj0aqKI5X4K5M9F5k5P6gJ6p9RSekUAzvqUNK20/4wYexp/NI10G7lx0/GvY8kSvMlO/Q9gRF2zAgJUZ3MYHYT970qL4+4nukXLAoaXfgLSJzw/Uj34XaHIN2KyXZ/XQ0hHTAuFNwd+g8uz+OAeswES0XQny/pBZ6KpGoDirOE3b/R/w4/R/Y/JU7EUSA88WzJGihBW4TSw+RbvwMGPAGpT3gjlp3jvjUFHlN5JbpUpXNSEd87hKUZt2Rym6ezBNAXKGXsqY/QBWQFofDPveqT9Z5FtchNy+8f0OxDeORMHExA+LYg4fFl2ek9VOIv4TJPfkPx+bUkHvK901D2vYPqjyZGV9TMag1dGafpchG9qtDTt+esWzCgGNbCQVmKBUqNh3QXmxU63nJY/enmP+Qvbgz5i5R5yw3qs5k188vVsV+nSeHYxVla3PeXa6VVtF+qNllxZEndYt5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea562723-2c21-41ff-140e-08dc43b2b54c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:10:00.6576 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 3/7] avdevice/alldevices: Mark devices as hidden 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: xkln2Hy9cqNL Both GCC and Clang create code that inlines the loops in next_input() and next_output() at high optimization levels (presumably when there are not too many devices) and this code leads to the creation of .got entries: e7: 48 3b 3d 00 00 00 00 cmp 0x0(%rip),%rdi # ee ea: R_X86_64_REX_GOTPCRELX ff_alsa_demuxer-0x4 ee: 74 43 je 133 f0: 48 3b 3d 00 00 00 00 cmp 0x0(%rip),%rdi # f7 f3: R_X86_64_REX_GOTPCRELX ff_fbdev_demuxer-0x4 f7: 74 41 je 13a These relocations can't be fixed up lateron when it is known that the symbols exist in the same DSO. This commit therefore marks these symbols as hidden, leading to code like this: f7: 48 8d 05 00 00 00 00 lea 0x0(%rip),%rax # fe fa: R_X86_64_PC32 ff_alsa_demuxer-0x4 fe: 48 39 c7 cmp %rax,%rdi 101: 74 55 je 158 103: 48 8d 05 00 00 00 00 lea 0x0(%rip),%rax # 10a 106: R_X86_64_PC32 ff_fbdev_demuxer-0x4 10a: 48 39 c7 cmp %rax,%rdi 10d: 74 50 je 15f (Note: It is actually strange that the compiler creates code that tries to read the addresses from the .got given that the addresses can be read directly from indev_list/outdev_list.) Signed-off-by: Andreas Rheinhardt --- libavdevice/alldevices.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 5ee97c56b6..6396076ecf 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes_internal.h" #include "libavformat/demux.h" #include "libavformat/internal.h" #include "libavformat/mux.h" #include "avdevice.h" +FF_VISIBILITY_PUSH_HIDDEN /* devices */ extern const FFInputFormat ff_alsa_demuxer; extern const FFOutputFormat ff_alsa_muxer; @@ -59,6 +61,7 @@ extern const FFOutputFormat ff_xv_muxer; /* external libraries */ extern const FFInputFormat ff_libcdio_demuxer; extern const FFInputFormat ff_libdc1394_demuxer; +FF_VISIBILITY_POP_HIDDEN #include "libavdevice/outdev_list.c" #include "libavdevice/indev_list.c" From patchwork Wed Mar 13 23:09:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103687pzb; Wed, 13 Mar 2024 16:10:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhH3a/UTTe0a6i7CEkj+Tz1XjPW9IXXTjoWwFMhJyseYn8kfWLwW01nSXnCY3Ll+Tvc7qoSt6O8/WYkqRoyx41VwFqt+rUcMiDVA== X-Google-Smtp-Source: AGHT+IE7tkdtihF1ZWybftdlLgvmzwm8D/BCv1Qc/9/e/6EvmvrljPO9iRthjolQThsxOFmbwAGj X-Received: by 2002:a50:d78b:0:b0:567:efec:6d81 with SMTP id w11-20020a50d78b000000b00567efec6d81mr3859653edi.11.1710371445357; Wed, 13 Mar 2024 16:10:45 -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 n24-20020aa7c458000000b00568358d7f59si98252edr.586.2024.03.13.16.10.21; Wed, 13 Mar 2024 16:10:45 -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=X4PwIqfR; 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 59DD868D04F; Thu, 14 Mar 2024 01:10:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2078.outbound.protection.outlook.com [40.92.66.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30AE768CF92 for ; Thu, 14 Mar 2024 01:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bAE3MYCMIAmYtO6RKTW2GeTEm2zPRr46UZU4bRSsAIJ2LOCKGrVGE6ynVgdiNkv+oz6i2do061E/we6hRESXhFD7WAPigSp52CwMZFMosjeMS+TzBQSXxkwUuFwVcKm78yo18Y1BcgCTXtxD0tLcx+o05Q6fcO7SssBytOjNZ4Y0Bxl6E5+uUrn6dJ6iUllU65kdqFNSoKNtSjsWVhUB1BC7+26AbzJ57+aMsCnjZQbWBdark3sSl6ZMVHnB8Qhyk+ijVvKDGo6s1iix502L5mGnv6r1M8/lsudmIImWqBmqYfcwAeW+vXrtsFjy9TUsrQ/yjHyOPZTuTWqQ1Irw/A== 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=YhozzmfWeDsM/7zYQYAMxe9W+RM1DUIIlirwxvXNHgs=; b=gHQOMK1rTTb3Zq9aVyWDudQSquaWxdPFadjFFdeUKlRzro7qcoCMkKpnKicxRU7TUoDKX/D2DsR0EpwUcQv+pASAfNDw5qn3BSQvqcojwZkCidgMpr+p2P6zXeF9wqtK7+zupgOmmuFFFUTG3Jf2NuO6DXqhcXwySHkt7cPRgam8JtmPT6MY3TZ+si746FlrT+eiTEJibqhZ7C6OtJb0kwyBgi/cJAG6JOCp6M+vVTsqY73Y7nihLSqvzBp+o46xag6WDTASCL6ogY0+eayo56D95HkAqMvIRPf+yMIXSfXdC7Yu6ft3RVrOrx/XJy042C4FK78NBXRZrXxrBSlJmw== 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=YhozzmfWeDsM/7zYQYAMxe9W+RM1DUIIlirwxvXNHgs=; b=X4PwIqfRFPl9JXFg+CstZRgyiS/yfXAl801Zm0Agjp33HydNw7uXPod+EdYft9NSzkh1hjkdOLXsaEZG1+XR1mO7aZQfkSVaAyQc0FbfXRxfeetONuQqnxQXREY7aOkyH+fotSJBBJi4giWV6K9RobUwoNwOtWOoSZ47zNCz0C+Kfc2USg8peOpthDxnKXVSqIf1RAj1Os46soSSFovnSaLDKADA7P/KzAwib6Dmfa3X5ZBK3bFWTHMTsSfS6n3YRF7I6IoBe6vGN/71vbbzBmBZ0q530MEuBXNYKpNq2EsOSbAb0lHoSgyDMqCHrj9xQsUcJdTAKc6BSTSgsyVdww== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:10:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:10:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:32 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [f9YzlzzWuWET5oy9pkwT0taJTjayLYR9HkTM++ZOixc=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: a3476654-5648-4de9-cf13-08dc43b2b603 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDyadF/9QYgeT/1Wlu6smXxbDhkk67e5tLDOTjmOK5x33QY2afAAWhhVcNmVStzxl5LHXAQ8zn2GPji0gal9KZsImQyBsP9wmRfini7JwI9Ec3Gxz5GP9AwRdmkg9qbIPOKngWFN2m2SqjjtkSm0qXpL3gEpoVPNX+V+yRLbDiRcdGJljblcE4fCY286IhJXKY3CuVdvDrirbe1jJtT58VYAjkDy/pvPn+YnW5E6NYj/21zZACa710CkiWWuiNtsLWB/4KhR6FSeBZIColO35r2rD+DYEpyx/GyCUqyVWgocuCUtA/GtABZsh1554wiNiL8Ski63R+4jBf3roe7jLS9HU3HT3fyrgVdLkM+iOQyXJve53LLpzxK4aBmbbzK3RHAMkS81IBWWz1Oq2iiaqSxdbfc1KWjbZM5Ve/dGIjOaTwZ9SVB5QlPByP6a4x25fPH/5bPkQXaU/3lLMeouKBQTWzndURvbY7yyqKIx3RA/ZC8z7sIiMpuZwO6H+YSwUluOKl5LInGMxLxQXZ6WhfiPNGSwj2IXSP+CQ8UTsbkdig4IK/Zn8Yr5ENa9IdrVTfi9Vv/5uMYh4MnzryYCWmdkG5fSaH7YPVS4wUNg53v1jutyenudS87dLkXbdrwjoekNF+W2twKYMMQA/lMylW7Ydd6yAUkOFpfFlXsPO1iUeRK6ibICcpNdJqPZ6N+JZpMrrMZmkkN5V1aMhcU2tG9iZONZMAqWVGOcDx2nxRmGg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hHwP4gubeqwfghnYvcJRU0FH0ymWU/dujs791vinTZD3PHVsV+G8xoDuBnZyrUciZIYo/Y8OdDNIgIxDdaX87/buU7S5fxedSkZ/3/xKsqlLtkwHUL9gqY55AsFzvL/Q2vE5eYh7LdB5IBPix4BkYqzjTxBCZjyBdWyQkII7cZD3SpzGijSBbQGB017oO+R8+1KC7TMzN196DWS2XV0Koph8eb2JMbcOxu38yTntm5tJ8CfDa6m5y+yyqysm21hm2370Js/210WjTdkY4OO9THzWD5ms/889jxIzY2pa8wyzgGCSpQLWqRhj9i7RYiBDgby09LRI1/4H5sFs5cAl/dYeK2gW0WAaBqCwJQvh8T2nIBzGKwPEknkm8oxn86D0w093Gv5Vdz9poZakGkz/tmdCOBKEtssybOWvK0vEgo3FhaLXqLI0m839IuUp/nzAx4SGBjK0H/GhZ372EvIIDQeeAk8qc54fnLSQBG1i+y9frTNsclIFW1WJa7XIwqjVEbY8dbKXm2NDY6B4izrOdsKbdSQPBYg7a0l/DJndlqKIwYVeY+7biDFsxaR4SS6j5xpqHBFui8bcfLUXrMr27k0Al2L/zsBaf8lDe1LHeIp011dIC6gL+LYK00ydYJWG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m2es149rgoP52aiHxTW6qT0vztA9cC1FeGuRTD5gxdw2QYnAh2B/z777rkGOmuiXYXvumvr2I2kHAgYTUuzNEI36pLRk/7QYwPJrGgRGzljpR2m6lRfAgrzwaA4jyXXHOEd1RVVA7fg5Qe5IzUZbjHvRultBSWlSHojNC/M1kG7rJktQ2vcuIP6aONriscSNlAy6Q+hwym8fj16Lj2MXt3/ZAkB2c1QdDfgvBWAfaVYMnlF9duY4kgeGklD8yW0eoUn88SbVqbvmE1E9DUEyYGPE9c63EjUrgRR1AiM+Q8YoQZryIxwtzWgcZ9g11zJ5kNkSOJS2CHobpriVny9nqMxg2BRarjXGCd/O4t3VJ4XBGkrRuYZgfsnVLVD9e4Q0XQ1UwQjH4HCDG+gxewuqZPC9rcc04y2rURTdb8CiSJ64RuZVogMVmSMG9Q5MK5uvs4VehxTniVK2VGCZzh6YRfa3o+DGt6YEC+1uEQejuIAtSvTjCnIcVnRvgZpv55Dz2DQuPKYP3reXkOpiytV2eSlQ98Hd60N1bukigb0MhKV+vaxZD44S1WSIKc+645nKtdeprm6Dw43PD9zyRQwqBsJwhekgnpw9DRVu90VEOWlfdpgdxG2GirNt2PeKNkDiu1DZACb2wka8nknEX2gCm0h1Cx/EOyNttfir12J9Okbd6E39nQEOcw0WVXIEGQ20R3gQH01Rg6HQxahvz/NrT9wn4MUTTnOnQpRxso0VhSNJf7kU/GBeIvtDTmfjTBySBsZebQuAlwAFcalqhIR89ptAdIvDgcZk8FgU019VEyc+l0eo2kiIAmaPzRv6vqJGcq9dpnRe3abHkSMtzd9ChKuUyXc7+6OAdKeP5rH+fKDaYf3twa3tLO9nKbX8MWwxXAeipwM3VjmmA7wCNSp6RkmUdKevcEzSN6/PyLQJZZf81Hr4r3oDGbiI2EbGwsDqWdCEi/0AyylcGDpPcK4CPX8gZRpx9ejpdFd22p1LLrNWYkUBhGPboR7AXefCFPK3gpm9x3oYyTXMTgKsD24TvwkgJhjbmLMf7gB28I7yzawmVAAT5OT+JLZl4MpvFB1xouWW16O9JC9HbnYfkTAbHJOrmfbF86qk2fUu/1W5vahUdvE67Ea+7VvlaMS/SPPCxlFOnZUENJWr4YOoR98zx07PhGcwqcIpq9Z9R1pPSGt3QE9AO2zMbnjRgbcM/9P3br9i3aRXXWHMadr/8MQSz1n/OvBh5d0sz80+x1SnBMjPseknVRip0Puq/6rdNWrGZ2674FQLED6M9lBS4KFnhg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3476654-5648-4de9-cf13-08dc43b2b603 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:10:01.8309 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 4/7] avdevice/alldevices: Mark iterators as av_cold 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: UDX3RM5abJkV Because they are. Signed-off-by: Andreas Rheinhardt --- libavdevice/alldevices.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 6396076ecf..9b9a9146c7 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/attributes_internal.h" #include "libavformat/demux.h" #include "libavformat/internal.h" @@ -66,12 +67,12 @@ FF_VISIBILITY_POP_HIDDEN #include "libavdevice/outdev_list.c" #include "libavdevice/indev_list.c" -void avdevice_register_all(void) +av_cold void avdevice_register_all(void) { avpriv_register_devices(outdev_list, indev_list); } -static const void *next_input(const AVInputFormat *prev, AVClassCategory c2) +static av_cold const void *next_input(const AVInputFormat *prev, AVClassCategory c2) { const AVClass *pc; const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_INPUT; @@ -97,7 +98,7 @@ static const void *next_input(const AVInputFormat *prev, AVClassCategory c2) return fmt; } -static const void *next_output(const AVOutputFormat *prev, AVClassCategory c2) +static av_cold const void *next_output(const AVOutputFormat *prev, AVClassCategory c2) { const AVClass *pc; const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_OUTPUT; @@ -123,22 +124,22 @@ static const void *next_output(const AVOutputFormat *prev, AVClassCategory c2) return fmt; } -const AVInputFormat *av_input_audio_device_next(const AVInputFormat *d) +av_cold const AVInputFormat *av_input_audio_device_next(const AVInputFormat *d) { return next_input(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT); } -const AVInputFormat *av_input_video_device_next(const AVInputFormat *d) +av_cold const AVInputFormat *av_input_video_device_next(const AVInputFormat *d) { return next_input(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT); } -const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d) +av_cold const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d) { return next_output(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT); } -const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d) +av_cold const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d) { return next_output(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT); } From patchwork Wed Mar 13 23:09:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103596pzb; Wed, 13 Mar 2024 16:10:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUD0uhOPRKq5uD+IlzZ1hQ1/brwNVnb3U0Xs5aPN9WEAhcaRqUFyy9wdF/+Nh2rld/g/fv/7mGWANakTzHv5C9Z15TbKDk37bQrtw== X-Google-Smtp-Source: AGHT+IEu8YGkTSDxvLkUJtdlxy1Ok3tD7oG21vxPaUBHRY1S+RQ2EHmlJj8R7sgjweOcHyCT8eNq X-Received: by 2002:a05:6402:ea9:b0:568:9d6d:c859 with SMTP id h41-20020a0564020ea900b005689d6dc859mr287221eda.16.1710371431941; Wed, 13 Mar 2024 16:10:31 -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 bf20-20020a0564021a5400b0056802618891si99217edb.369.2024.03.13.16.10.31; Wed, 13 Mar 2024 16:10:31 -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=YF8W538b; 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 29AFD68CF92; Thu, 14 Mar 2024 01:10:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2078.outbound.protection.outlook.com [40.92.66.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52F0868CF92 for ; Thu, 14 Mar 2024 01:10:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ek/+TShNFB477SSIEeLJf9M7H+u965poGWMUVEEfIW7cZGaf8vLTx9fDYAlY0HWpnMgoQHi2s6tJcFKzALoO2mxDVRF67XDOEn+kzBmSMK46Ps5ww3hxvL+CvFf9TCqnmoYuuS/N50BJlyefTZMKLfDvhoZgtqQjAl/+rcFllTSWRkE1qZGx6C1P/dCEXFnN52KDi7N0O8K+vKGLD+mDE6CNEZikT5/BLZfaSe7E6A+p3jVtA5ghd6V4sC6h6rT7PkaduPF/5hD4UV1OYaU2oJs/R5PbUXvgsOjyNAUqfaqjN1m6mzrBDKPPpQgtobdlTINI7Qcbax+45ix7zlMQ7Q== 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=GGT+R17Hm7cbsLq6yleK4v9EjyCxZDXvksPHhXA2ofw=; b=aHbwyhRj7H4rc0or6o6f9t7BlfdtiPc2eK0EWFcf3cGh4+SM0SGzs2/ObMGqCAlngPJFjEsyvICwQXldzLeCF0r6qdpk71B/O2ZbA+f18TEmFkO76CjZ4pdgzSKDfvepFZ+CloIi+lN5mwVgQzkFAVIpew1SO38dEn8I2uTgKBhLmCozPsKmP+/+I3isxxGPYDsS5sxNKd8CRQULrkVO/r4I9TTinC6VZtPi1iKkM/c9BoFXu+FKnNYLmETDhODoDp1EJaaA9XBkuBmthRqIyIWSa0nvAgit+58GWNn0VqUkj698uADRiZse8o+yTemBlHSJX3rzgp2rDtp9wnOdsQ== 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=GGT+R17Hm7cbsLq6yleK4v9EjyCxZDXvksPHhXA2ofw=; b=YF8W538btQUC4pVzkNkEyTbPsu2FvY9b2bgZLIExR4ZlNsXwu07wl0yWUwjTAO4kak2V3WBbVPkOrTcM9lSTUFIehEjkHLb7RGKRbpIctVwDArKJvtfzWlf7XNNYQQQeN0Lmby4gSJk2RMG6oJ7uJqYQJ2Y2dA6uzV1UnGE6Ir9ZshgjqxVx+K2lyZlFQgpFN4qylJ5TwU7sYYh8zcIgh6omiFu0xlvM59eUK/os+kfG8WigI4v3hK3kVjVXu/28uQCyvSI+W/mhs6ZpZuplgTMEAT5pcv3KIxQ1IskdfJHG770IoXp4mBwSnXFFulXKkt3VS6GWpKYqx0zI/2ptfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:10:02 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:10:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:33 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [6NqosecRFkS+54ERbRrWPZUNYGv0XVXCFNAbsWNQc68=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: 33b84ba8-7854-499c-1a55-08dc43b2b69c X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDyadF/9QYgeT/1Wlu6smXxgxON+kw0HOwuS6T657TbV9AW67MGCl+iqwpIP/Qp2WJM4V1UinSfRbWU2Ze7t+mnKaAzJYje7qZOYSZkdkBHpbDZ5XYO8hN6e0eZcKurNWj6adn890tocU3j2hEE22er/3lN++gzU8AnjZGKLSD78nYlkkudpNnaPT2KXDHU5lMr97WvdVjNUjPRk3wLtnn4hUoPU+Cy/pG9j6Ez+yZz/4q/D/UTusZWo35mdcdg7LWXoOFDQP7iFfwQym58gXqTLbl3/csHjHQeZ+pV5zMho6eXLWxgQAkCvHuY8uxLIoG+D5XQdHvA8I769xmCsdqVDU3Ek1ymLBioGh+XYiylXZCbKZArSmkNcHM8eon3E5Z5DXTgRZNtLok5zcBKX9PtndnoBlP10LyEi19IOrN0k3MxH0vUOKc8Rgx6lXVFzCcRblIW+be4fZkdG+fh4kllRBbfurBfOD9iX4JQT5THaQ9hKf3SbrNNHUeN+0f3RPFoD8Xa2kN04qYxo1vdBVlTcgj3FBIH/votWKIoPLYj6j/RLvFjucOLDJ49okan+Y7kwr8wUUNgzGNGoTmzwZMpgbdjUZP1KTP+dMQModJlagxASHxABkZYsADdTAwJREMZRrM5zOkI1FOufVXfPUtvAM+gvEZZeTbTR7MB2KEQC73dQpjpPOCSEQxYHwqtaO7jMWCtz/eko8YPCUW8oPpyveBqxT3twv4bfS5/jZ94aA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ZbINIgO9+zE7E2Y1sdsTTjtCd1qvjZ+t+JeH4fX2Y4a+CxALQytqZ9F+KEXoQOLzOM58wXLoHzYKexOnwCilnJX/88RnkYyKCudq3e8JM1ZEYGyp5kbbe+HsnXxeHU7YGuZ6yaSSmPuF4MF+Kqn1CSqHzbRb/yW4TzTzfjZQ22SlXG5DFJ5uyvhE6q7y3pb9Ct/VUhzyKXUjqKrVa6i+i932BQ2g3cgs8498nio3teUesF3yMJIWshOax9mL/iwnxHbjOvJZIMwv/Zdl4z2ZvF/lmr68b/G9qTNLaRn6zTrvxHkUXR3ULYO9DbYj6KXZJMDRh0NK/vn3yAQbqPQc8kbfQM/NfTfP10IdiJDoLU9v8+uSdyXMBF8qlapn7oo+4qiNRu4sw0v9NEE+OjTj7R7BgsI9MvMwpx4T2+/19QLBWPk4AfVv6/jFiCCmQJOloRa54EVG3bRNZ3P0vvoKGfTXtVvU+7Udxuen0KzOGV4jjFDJKxKfdxLYTN3j5bH3D1vgBc5jQxLI8nFo5NTaXjlDGCGqs/DpLVDt7mdgooyNAOknIjEkAYgFVI3+MWhaEED5ne0sYzFzY1YQ9oufjshDQthjltC6FMlCGTM4eHL0q3VnjV2ShRbJ2BHXAcH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yAbzwzc84LKgt7lRE3DMWHEj32QDyNybWGh9XYV46C56KVbPcx5GRMETR1fI12DJ3rgTndBlMouP9b0oIYoDWyk52Y3CPb4lPQGnQqh1pn26avyIc604tu23+KM0P3u7WB5OXEmW5c07jPvvOTInSK9dz8KRfM8OCcWymSd+k4DHszDNb6j69Sdd9XcEyl835vicZTxkbTAD5Yu8KgG+/SgEi2fNdxK5S66ExSH6I+cPdH6LGsZ65eR6lzMBf8l0HQGdv0LST1qbbR81xRFD/UarSYl05W5O/Hqo3wUuai8qTRrC3tL9qUY/xqVg1QrzY7c7myw6m1DRruV9W7tHc6Md0wn4TBzVnzZI3INgmwpWUka0F2Tkx4/nlpYsujI3xvQfRIDule8xBnAPq5ts7Q2eDPlms/O0Q1wPl1vV0cEg8YnirOov1C9P+pYnui0kHnezRdbmaHFJXH1yHrF86Y9g8xiM0kfSsrsGvyF59sVmtCS+Vh5C6SPzwAY4XaipiFFiD5wozulWsV9kRjwMGC13E5QX0Ux1eYv8XZkonmSZabNLsBgTSrXjc48WyuGtNwNYgHtZdpZmUKyVXbjTRuKQOwLUoUktbmUvoAAtnDcALul3k+MZKAHKfrv+lss0P6PeGScTZ/f3ukNdag1si6O/CNaApKRhnvHfhtDhHo1X+zjJWEdEtwCgqCsJWjskmvyoZvjzht06ug3gNZg2oZAx8JW4AYrGbTrLdTBp1vgMl3BmkS7N0FsEXX4eGNSfXkAq7L29C0u/WCUg+Pg/QxbcNmYq4ocyXSr1yRUg9I5sSJlmOcmEtCnjA0UVuOJrmO5KgnWTpje/odcc9Bp54Uu8hf6Zv10rvSVNN2F8Fv9QfE+/gYH56eLHKLpcemZNPAQpQa/j1u4IWQEbUZeNOimW7zZMPWK0Ct8qhdBlAgc8gCj+r4kU7LLVEzRk2ybh5U6+Y3D7d1eCFO83YjMH02Yhi3Z3vEQiJHA/hxEgwyNUqPAvP7aKYdNwZTY+0sB6ttowM1tiqKzOVfKhvo7rOK0tnvT2wmMKoi8n74usfGbxWVnhd9uV/9l1lY6XyXr7/q5gUay9NhMpjdN0HfFBEWFFZJTuyMdfoxoLA+oxhgi3NzPoSUHPu5R5cmtYYfkV442LFJz+fNCC4whJQnS5RYy1FSBKF9vjdfAJCN0yyd0Ln8pkD6T+B7cI6JwRDmILm+LVYqrpwZKiHgZqoW+nMxfL75WIq/hFHH2xsPNtvEaaCXeHqz4fvcDxTv6BfyP4MSLSDPldZ7Z0/+/1ByDz9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33b84ba8-7854-499c-1a55-08dc43b2b69c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:10:02.8965 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/dirac_arith: Only include x86/asm.h for ARCH_X86 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: TjIgEp0gF+nY Signed-off-by: Andreas Rheinhardt --- libavcodec/dirac_arith.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h index 350a58fca6..203d481603 100644 --- a/libavcodec/dirac_arith.h +++ b/libavcodec/dirac_arith.h @@ -28,7 +28,11 @@ #ifndef AVCODEC_DIRAC_ARITH_H #define AVCODEC_DIRAC_ARITH_H +#include "config.h" + +#if ARCH_X86 #include "libavutil/x86/asm.h" +#endif #include "bytestream.h" #include "get_bits.h" From patchwork Wed Mar 13 23:09:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103773pzb; Wed, 13 Mar 2024 16:10:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXI7Uk3YYN2/7VdKNCHp0p2Cl6kP02WY9X2Hsi4e0HAXWATJ0Ge+k/vUdrFv2L/BKpd9qvw9r3Jc/VUgeqln2Aid5Zfw5bQTsDN+Q== X-Google-Smtp-Source: AGHT+IEk+sBTBhobQU5rDAlv70aLAwUSuOj2RfdRa9McAzsrmFIjaZN7xtDQRU/Bwm9+Mccq2V2R X-Received: by 2002:ac2:5e2a:0:b0:513:c4b8:388e with SMTP id o10-20020ac25e2a000000b00513c4b8388emr3024605lfg.56.1710371457429; Wed, 13 Mar 2024 16:10:57 -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 l22-20020a170906a41600b00a444e66e76bsi105548ejz.639.2024.03.13.16.10.49; Wed, 13 Mar 2024 16:10:57 -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=Nuh6ItGH; 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 63BE868D065; Thu, 14 Mar 2024 01:10:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2106.outbound.protection.outlook.com [40.92.90.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DF5E68D08E for ; Thu, 14 Mar 2024 01:10:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FBYeltJaRn5jA/oqOk+nuijI2H3OyfKLIPgZKriAiRpqjy+TKMRmZ3iZdRd5FOfDJ5FlrVx9lUiuy213JZbaV5rzxyJEipNMNBEnELOv06N1OOybJvCcyRprbmdAxF9s2QV6GpQX1V5vb3RAwDmYsYnygNtdXKMICT49huxclVvyGw4THhrPHNvA3aTuPgB46BW/R2tIs5cw0M7gCcV9sz30qf8eY1o65kFH81PFH5o3deS3a2Q3qUAWzW6isIs673mZ3DlLD8zhXlcZbUhekaxNTnn/1qngDJX5hANIE3N9JB3fJlzgFpECOdrp5VTTpFfc8eR6DZlTSOvNd4Ye9A== 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=zgE3Mk4YfLWtNZzn9t/Yruu8mLxcF/ahOnosWufWjFo=; b=W4shHNq2etU6uTwZxqNTMS7YGN59FRYRAPbikkmR9bqSS6yXvojWgkKhjhm/n+tyRd1CPpvV8oCA2dVIROUHVcljjJQ6EYstVOUewfm9cEu8noFHQ3BUyc7A64ayb1U9ybjRsnA1BY+AR4Zyt93R5mSN1MGxXXAIFFyrUl7Oz6hzq1yJ8OHjKF793S3JWlxOIEM6BPFDPn9CmWeVQcV/pe08V6EN+MbjOS08M1ndGm9YHuy6iG/OaB09sfCV3QhQ0WwzerqVzyLpRaxaYaN6iCq4N9rOGDNioJwaY/xSHXbXdiPrWZAE/KSTrRQp035HjQ6Ws3VO5QqiEspnUaoPDA== 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=zgE3Mk4YfLWtNZzn9t/Yruu8mLxcF/ahOnosWufWjFo=; b=Nuh6ItGHuMpv4z0Vv3Wdy2S5ZP2PoOhJBqjpJGzBABU/Ez1x27s5hcSdmBTsdiEQWsNCzT9sk0HNv2Shfyvo/PbsPwipEyODJuMrbpd8s7ZObPDiU/71yYMsaGW0izWij8DFTF/DGRmb5GU77lHScVGV1VlZIhi69WKx5T4TzsNQEvrJZ1q9qfooaoDlylL7MTel1vgX8yMk9KlttMBORbTbAK03SyjHD5bArwT+bSrWpZBtYGBAYOai3tTNQZx7fpl6lF5EmncVXA+YRj+rXIwvANnxE/XmiSOYPjTLxqjUFzdhYqLbNUlsOlYDVmDaBnr0rf5Af09qtwJL2Rpzsg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:10:03 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:10:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:34 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [xyL+b9En/0J9thULwRgloGgOLurpgnv9e5Umkse3YX0=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: ba16bbe9-6d21-4d14-a188-08dc43b2b738 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDyadF/9QYgeT/1Wlu6smXx5VVMPrPyzHujeg/BL+GpK9+55VVoPZhCQ5Q0ToZ2kgmpZpCyd4T7WhyYWPhD50v1S3oxoCY+R9T4B0sfy32OgIVBaGrAV/05nru7r8eTNA+M1FxW16YV635r6uWNaO0BiiGEKvM2bAmt6AucGEljuGT9+SxnIXTefT4qa/gSwQv3grmQFWKs35q9Oqeb711rej5dRuiUz6A7WCeOZ+TVjlyGELdH3s3dSWd1b4Ts8+B32IiCe++VDL2b6GVyqQt47+KKOjj75rtFS54HNHQ39M8fk9oy+HNSgtcLPvUjrz0tnzuD26O95/CiV+dk7KBRMH7VoKv6tiay+SFMG61TFvjA6Ekc0iGEnIC0Pcu/WHhglJWHcEA/pkbafQbjURfW/7WevlqFWCk9NcJzi7JLw+RY31Lv3dcG4LOt5mzHCVSG4UO2/fx0jZnU8FefYIfA347o96VqYRzptF53NC7VWjz3d2qq0v/L+9Uo5RHEa1fLdCRJx52nmAA/OF7sG1RIbuXC7t8P5lcu1TTkiqDavP23fXyJkx9EXbK5olOwUtYeQjaDTObRXX8IjmWcJHzapIwV/IqrDDKWQ/5beADdZejJKHUWxZQKcW1EKiC4SYVlaBRPQ5HckTAUz40577+WyLqihnAkBw+sfznfzc6OcOV39Ytdt+IG5NJf8za05xPQ/jSS9B/1WN5vthLAFfKgAC64WAGkhsUzFzZHyE80VQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YeYBebJ56bnYKVHF9EUGbVA7KQOxJhxjIfxPHYgOAZNSTKfft6jW7uwVPp3k1dZpTGl0bf4kJ0ovOYP3mpsplDgsRSp3dfB9LPSD8BfYvklrndZU7JIHwa9WzdKDunoKuwFQOTzokGWgQK433h48iSEG6CqlX7lDJIxeUSOpF0LJPlkyyHLq5gsLP4X6QJ7NEJCtYNU8mq8e5OP2SDsEqPBwt+A80mCpIG3+t4fe2g5KHrYXKyHoToN5LwSCTMgEQg0G5x83RnlxehbcWJBwoGh4D9msusH9pEt3FUXNNAP0KJyTR1bZrMxs/yBlXCC7FUjYhLu2xZ4dCT0LuUuvvYyHC+zPkm4WLBLKbO8jmNiXHc5fFSI60D970lNx+jRNYVlqQiIA7oxTJTUF4n6HDhBhU7KWyxFBlh23ETzekkzDqytlxPCyPaK/Uo4JcLStbLeTrX4i2xpfeJYmxjyvkAL1j74xv/6LmL8hOryQ40XULImUgurFEbaAjo5TeZC9YGuuE/LITqY/GBbO3IsRDCLExGStv5UD3esrBLbpEwh6HUXJ0mdurE6njB3BMfMXiVurhNk4fH0vdqzZ9fsGuAd9svD4m1E4N46s7Dh1sqiyijmLeJhjdloAmPyG4/oM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YcieAUBfkafdPxKXPlNsMd2WSGaXdaecxikbYP4xL0JSMJSYLA6f/fcSAhrk2n9X4C8zgndnJBilTyvfWbfICVrRswcZlQUia1O6g1SgiugRbk1Ht/YVuk3CfuNwNMe8GgGbweu8pDUXIq56RUeQfl92n+UBjkRE+2Jsh7g0eKlH7fCPRyBlt1IWpvK8cgTx08debJpg+WFnBHf0kE1Mtlbr/0q4Cz6tIjVlDrecu91bXQRgdY+NiTL8XAKfxwgYK9TeX9BPiheEcNtMxA65/rtQ+qvTvDnLtZ8FynQrEVCDh68f1f2godoYcnm3q/9Ef7HqcWseMWBx8y4dFZvzgcDycQsqOyhfkGz5Y3xLjVnsMxX4USKWY6vI/yPLOeZBNl4UiIdwotRI7/c002rA+Pgweq/Ym7XcAAVkPSsB+yMvLHJ09RnOMu4NdlXxNGJkdcMPvWqydOkEeImRR7Y3UiqmkwMz2zzfxX2x2l1SZx4H/AuR16e5TtW5iHKonrFxNpmmRT3fKRLTYYGMYFpbqLr0Bp7XsNoN0BQttCPWp86AePbI2RDsfEoNBiDgHKf8XOoZx+2MDQHUa65QtVK4490TUNa8HTBJiJbVxmCKi/cW0LkgT2wsOqo33Y3owG3sxmlyzZQkJBUx326grxDc3eXUNfj7lODcRP4XdKyfEbXWGxPtKzV+LNAduDI9lettWni2z7QNmgdU2PzV/vIlnKQTs7yvRwVw8Vzd1M3ryl6hE53NFXPK277LTNQWd/fUc58tKTS9wd/wgU6b6eWBN57mGa278+n9zCKsmA8kE6MBJD6sGBsxxliegcdnlNJeH6JZ08WkvlfjF28qSu2mBVzgbIXFoKFIqkunQirFDCPmdEUIloKxn5ct53VGKpRjh1YuoqewiW1nmghHy8qb5zvret/R2vZUo0G87vUthbGIjjc5a+HmtmG3JaO4nhn9c7aS0EqaQLxoKj2VqLj88/1GA0pXSaSyJPIFBevd3uFgIUEJatNw3eKI8U3r3YbjbuglCYWWpGyDLNdKHHtKfFnJVwRbWmzQJ2wEM7UI2YRVp3LWdtHoGeJWB8duzcH3bH4q0sSTgk6OSFbR3GzVOe5fblw4qgY5q4e/IDegumb16lT/ZI0ieWgFjm/z5PJy+7FgEXQAmn68eCia8ryUmNsG5kbC9Zv9SfsyVBTDeLgXkUU2LXKJONpieh/Jv+cFZ7jlTvokoNuoxcl7cOey5Shtw/FLIzo2iC9o/4VouSdAb8priIBk9zpA7qKQOgMTdFFuewBrAcDgl4MaWixuGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba16bbe9-6d21-4d14-a188-08dc43b2b738 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:10:03.8970 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/vorbis_data: Mark symbols as hidden 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: x7Zco6B8+47O Avoids .got entries for ff_vorbis_ch_layouts. Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbis_data.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vorbis_data.h b/libavcodec/vorbis_data.h index 51c91c9e04..327e5ab2ef 100644 --- a/libavcodec/vorbis_data.h +++ b/libavcodec/vorbis_data.h @@ -21,11 +21,14 @@ #include +#include "libavutil/attributes_internal.h" #include "libavutil/channel_layout.h" +FF_VISIBILITY_PUSH_HIDDEN extern const float ff_vorbis_floor1_inverse_db_table[256]; extern const float * const ff_vorbis_vwin[8]; extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; extern const AVChannelLayout ff_vorbis_ch_layouts[9]; +FF_VISIBILITY_POP_HIDDEN #endif /* AVCODEC_VORBIS_DATA_H */ From patchwork Wed Mar 13 23:09:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp103648pzb; Wed, 13 Mar 2024 16:10:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdVV3BPhjHLBRgjsa/S08yWGgFHh4uh1O21rlQY9Puljc9rMXLU7xnssIrfhG+2FGb00KndR2PYyqjYNSsKdLZD6Mtyf9HlHpTCw== X-Google-Smtp-Source: AGHT+IF6p5FfXtVGOJ8H85ADmukET8StTk9HhQqqew3IBpmtAHmCINZ9RYARomfTzufHylHA7UUX X-Received: by 2002:a05:6512:1256:b0:513:5af1:9d7b with SMTP id fb22-20020a056512125600b005135af19d7bmr5158741lfb.47.1710371440959; Wed, 13 Mar 2024 16:10:40 -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 i3-20020a1709061cc300b00a43ecf0b173si100998ejh.762.2024.03.13.16.10.40; Wed, 13 Mar 2024 16:10:40 -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=QiVvJWOd; 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 48D8268D0A6; Thu, 14 Mar 2024 01:10:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2106.outbound.protection.outlook.com [40.92.90.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 504A568D08A for ; Thu, 14 Mar 2024 01:10:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gu8vx2Y81ABA/ICgTGnz8p27ZMI0hcxogmtjuQU0LgiNE8iUh5DAk7CzIHu0px21mzzaFtz7AHqCBcELiK96XbR5rqQvXPk6AM9pdHUE20cX3x+mFTFcjoG2HOIubf2KHvDprEkX8Sf4BaJ/hAJLTnGZ2PjKDNRABHd2lZGNt+TpoTuSd3+gUswNs0ER7jrbewZpWgBYz+5xFsKHN1EACGNBjZIiCSuOSEtregsbgOdo8Nm+490rf8XQiLIzfH5/gjTu0ZTQ9Oj9JelnZzU4Hnl1sXfDP2vs1SA1jHy2HLSFDXM5sRqAt1jOWLL2pKhqpIA9wqxcW9pk8OvXUl++kw== 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=r6owvyV09ugAbnFKHrqEMLZU0UEFAMZKo4pcp3Bz2fk=; b=ZmMpZN6uFPtDKYYK8s8PuDnB5nr218PbiQeZGoxgH4mkeYWHr8HxtMTGY8YXWDKFbypVwph1oqD+joR63dvkHmd/SJ2OUDATUBOs0XzdlxBeTOyWVzKcyb3l4IwRDf4+uvwfgKsg+bJMWeeiscrnjYE8V4/FXhC0whw+eV2rdBPgWRTT/bOu12pHywp42v/Y184RHqCMYENEOBazGvuF5QImPCBn+2IFayRGAC+Yu7NX+TZVUiFjpPI3TK2szYDHcDI8cftGZzzI5yW5MHKi41+MYvDFRqJyuM0Q3QxYGJrFCwE4L4n6e4yYY4S3MFC+XAiLv9O5e/+ZjbeAIbcfFw== 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=r6owvyV09ugAbnFKHrqEMLZU0UEFAMZKo4pcp3Bz2fk=; b=QiVvJWOdW+y5DZOPgOHb+881bMgg+Nc+UfyaWLtuxncp3B7zGBPbZ46N0Sm35WNuC7vlvO+twi/nCSiyFPS13z3rQMLRN/LSnw+6BwA+odaqKL8CVzERDrV0cl08iCLJYRhFkSbR/G7Xl3g90x5NhBGk8A70Dyj9hntfdyyzC41ht4uv5XTU+KOAZ59iNwg2IlZBECmHF0GlAriAzuSN6nX9WSaeml3dPs6UrwZzlAEQTtap8EeXeJ7D3QZvwoAyFPfmqOID2CT17iQ7bagJv7gwLPFa6QEaW7JCHNIP7/lmW3ce5l2PC41ji5/DT5s1ksYusyK1hit9qINZhHf/yQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0126.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.38; Wed, 13 Mar 2024 23:10:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 23:10:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 00:09:35 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [OzWf5PuynwYhAst++7cHQwGjwxnBDqFUrORsdRpxotM=] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240313230935.3058793-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0126:EE_ X-MS-Office365-Filtering-Correlation-Id: 9258e95b-1aed-460a-d604-08dc43b2b7bd X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO9/H5+Ew1hir0C0rADHTO3rjmm1bxtUgUB74gWuJRzjfLEZY7kZz2UnO5TmyU0OI+M+aU9SYb8EFvm+aR+OVGI3wQK3RHCnvqCN5QBK7ullJsM9V477sI/x6xE7Y2+cCnDIDijJJ75V9mP2E2Y6Q4+0lyEw6r/ZcR98H+inaP5Z2KOI3NKx89TBjUs4Z8cSAkXTXiXg/u1GZv35Eipys5f6YLn8OgV1/lp+qmZ7SFVr4NpdOKEkSZls47l/8FJhwupUnCDby0peWcRmELB0vf1UM2aLrPWCAhvLiUw26b3Y53mUNtu7JDXScmPExzFlYRnM64KYt2rb+PBz7USG8rh/zppQjNfwxUYdajkqcKvSN+HPyNZq4BoIPiAYx21DUKHH3Jvd1cHGPFk/6sLav5tiwLxgpM8lJvsbefZyhNS/RtxqFpjAblI4W7OdFTK7yYDTpXpupgTcnVdKH2zXfbL8Ra/13r82+u0RDDOc8wC/O1fA0rlCsvjI4TZQJEvlaRUDYdFCHV5wcad7xSD81cBye47qZUo7f+ikbEUUC8VayqF87tYSjnP50Vyx5JEibS85bgpFNNECChVTR4n92w9d+I39x/XBPkE/sfs5VFu0nRfW0p7QBAgqBFNeuFhLaQhdVel8QiAqqPipEp45NZ8wax5egKAFOssywup80x/MEb9Xl3rUFKLqIIu1yMbreKprFl/5aaJAxw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: psbKsIhrVhwgOwpi7zXEZ3Cqazx/aQo9jdWQLBZDj2QzJAINDv4oZU4aa2nRKNd4JP3j8Xl/rRXCdmwM9pPhgqOEnj/S5za/P5oH/ldaDpUSxHyPR8G8ACZA2nyivTjd6TZSH5xbW2xo5fSH0pV3vemEr2R9ZxjOtcIQj0SAHjnU7vORmd/LS53zzmVvYI4VTDdZVEKdVLQb0NZuMzWZM2LUo8tfNm4H16aeadyu29LSLMbhyK2WQ1JIVKEd47tnkhqZg9hhCCFcnMTKMHcbPKTh7E1t5R7EQSpC2xXoiKDJ8ORDAxml0BodDpIMHa1RQWOVgXE4QOh/pPH0xNe8W9Syby+/7vOAsM2GEov48btaEeCFS5KQEDmmTdWU8LxprGbr9zv/pmIPsrr1J98k1qGEPkjj98om33msWulfGZxxT7EqF321+r2M+mcDFxMsqlQK7HP1QtkapO5ptWEJoZZw/HmCnYQgPRmMMdcPLlR9qTJ2hE8+r9lLLR0kiptFoJv/SsD4wBSD1axsQOmwoNlPClWegO9Tfi1Hs4ll3/3aREGXzkiVQ/3DJ5FQGy0FehYEpC0kFgxcHoq84O5EuLS1aR6hLpqDtBo3c9IhgDmKAjsTnEc93bdiUkXyB7Nd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XjmNd0ENSj45Px2QsXT9IHYAsy11FD0OcPo66AGTgoQvNfLAf2fLgDEMJyT6FSACJ7gwY748g42Vgi6J87l06viElNa9rCMFdKiFy5NmMIkEKJNxXfd8UUE040c96TSlJTYKTkl4QK87ab5l2q4rRwIeDhJFwsw3VuGjiH9D4vSG90FhPQYVoCimt1PeaPRbpO5d01j3HKFjHprsLqmQ8+m0wlV0Pcntia/Ha77w08pnjO5NDw2jDgiEKkcQywQk5GeeRKfhwpmaXuzsDNiatCakTOs5LMdDUxjyh9INU3nJXW7kpzpmbmfYzoEMvwx7f9m9fh+rAOW+ezB7vClOK3LwUOjiglSN0BTaq47002WSmttd5Dny9sT0yAJa54LmC/cDPYQoTR1BvUTV5nHvPy0tado6iL6oAvLQGxcKmc3CU4XOEHg1tJ527A0Cmo82+SHw36np+g6SDjc8hPvvjNA58GKLFnBAxNDPJMALbSjztuL53EedX94c5LT+eiZxwicNYKlczsLFxSAttNcqzsx0SEK1soBsc0kpu4utADFLh3ox5wT0uI/R0LXW8E7ypkmIMfPngJtWOyR0GfxtN+5lOoPWzYvWcQ8seZ6vCSeO9J5qHRu9QDcWTsQb//N8NhLPgu3oDX+zEWmsN7a3DHj7x71VDcM76pz/KVR1+qup1OF7uyt8wu+hw6SbXNpfHI5PljjBcKc9y9nd7nqASqd9GhflqAkUoK0tfH7Xtcn7FEyItMj+kpDiYD/UJTvcAadQY8cT+b962Ou6AjKzWPwc4sDkHxTD70gLFEltRZK7apyeBrpBvwbKZ64+DMDx+5PXYc7j2k23MUR6F3hRYjTUhfKyNiqdVPsGxedsUwylJX9q2hhXLhu3dC3u/lY7S1TOyEs1qH4CVnXYpFQlUY+KjyxF4drRfi2qgJ8U3yI8u2a/2HnO7TPSKmDuJZ5iQrnous7Xml8zVktIWz2Hw8jgQQbUNpC/8FnFZv99E/J/h5UT20xGHTHyY64I14p63v/RjgjEzdY7/BfolWCh2O0zQd9lE2TE0RXHxIBYNaRgWjowURuWO3vok6mVIBm+Jbqew90rvXBmvzvUk2eiCigniQyWlthlbBCKst3gLuWIPb7YvX7ThuuKV4QpOCe2hy9Lzkn62Lw9ZkFOZ9Jho/totN8r0N+8LFaKlnX1BEEgoRPqh+DqdF6FsAM8N8oE4glr8H4USbsn//NMIHjs1xPvzmpf8YluTDa719HItPYSAHGPQrh0fyQxvxfq53BxjaAnSus3G/GesuIVcmWj7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9258e95b-1aed-460a-d604-08dc43b2b7bd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 23:10:04.7368 (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: DU2P250MB0126 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/mpegaudio(data|dsp): Mark symbols as hidden 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: oSHhJjpJDZI5 Avoids .got entries for ff_mpa_bitrate_tab, ff_mpa_synth_window_fixed, ff_band_size_long, ff_mpa_pretab, ff_band_size_short, ff_mpa_synth_window_float and ff_band_index_long here. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegaudiodata.h | 3 +++ libavcodec/mpegaudiodsp.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h index fbad67a0b3..720c4bee64 100644 --- a/libavcodec/mpegaudiodata.h +++ b/libavcodec/mpegaudiodata.h @@ -31,11 +31,13 @@ #include "config.h" +#include "libavutil/attributes_internal.h" #include "vlc.h" #define MODE_EXT_MS_STEREO 2 #define MODE_EXT_I_STEREO 1 +FF_VISIBILITY_PUSH_HIDDEN extern const uint16_t ff_mpa_bitrate_tab[2][3][15]; extern const uint16_t ff_mpa_freq_tab[3]; extern const int ff_mpa_sblimit_table[5]; @@ -78,5 +80,6 @@ extern const uint8_t ff_mpa_pretab[2][22]; /* Initialize tables shared between the fixed and * floating point MPEG audio decoders. */ void ff_mpegaudiodec_common_init_static(void); +FF_VISIBILITY_POP_HIDDEN #endif /* AVCODEC_MPEGAUDIODATA_H */ diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index 7bc635191a..5e47a263bb 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -22,6 +22,7 @@ #include #include +#include "libavutil/attributes_internal.h" #include "libavutil/macros.h" typedef struct MPADSPContext { @@ -40,6 +41,7 @@ typedef struct MPADSPContext { int count, int switch_point, int block_type); } MPADSPContext; +FF_VISIBILITY_PUSH_HIDDEN void ff_mpadsp_init(MPADSPContext *s); extern int32_t ff_mpa_synth_window_fixed[]; @@ -88,5 +90,6 @@ void ff_imdct36_blocks_fixed(int *out, int *buf, int *in, extern int ff_mdct_win_fixed[8][MDCT_BUF_SIZE]; extern float ff_mdct_win_float[8][MDCT_BUF_SIZE]; +FF_VISIBILITY_POP_HIDDEN #endif /* AVCODEC_MPEGAUDIODSP_H */