From patchwork Thu Sep 7 01:05:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp297348pzh; Wed, 6 Sep 2023 18:06:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGBAMtFyP+kWMY5Jdx6y97ohpA0SLsTzGOh1STUY2lrqiSvytIRiUT0qiqdkeQ0Ymg+MDOQ X-Received: by 2002:a17:907:2e19:b0:9a5:7e64:5c55 with SMTP id ig25-20020a1709072e1900b009a57e645c55mr3491988ejc.22.1694048762271; Wed, 06 Sep 2023 18:06: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 k3-20020a1709061c0300b00993d5cdf483si9967718ejg.807.2023.09.06.18.06.01; Wed, 06 Sep 2023 18:06: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=Nhb2b5dA; 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 79E4468C6F8; Thu, 7 Sep 2023 04:05:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2055.outbound.protection.outlook.com [40.92.59.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6173368C7E7 for ; Thu, 7 Sep 2023 04:05:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H01jXgloKKnNfPT3ufWrsIQOC1Nro5wvUPXY/Y63ES8n/Pgg0bUFlhHMBYvxBMxU+Zy8fEZw7qwvkkEoxv1NBq3S3XFIaroI4sdMSW/DWDlxO4DWe/Mhz0zXlKJ9kPa0mYnGIO0WVjjMJlQSpfFkM0i5xPB8T75IN2kAQTihK4rD0CaBP4UGgAMmPXxVZEOB+Kt2DUTzbawnEj/E+hj0GINIQ8IJk2L3fbS6a/ZTLM/k0ZSB4T4BUwxeAVD44IvEUlcEIpgIeI3WUBBbMY9Uz/C0NgbZmN9sc4m3nEFAIdWINUFT36QoaEC1ZhDJofVxgl0SrUpwI6299MxHyK1pyg== 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=tBwcVpRb+FNE/4UsBgqGqCZds6j2XCtl/OzDwCch9R0=; b=fy2XPFW70pMwFxHrAJ3SeUYq21RZd5G0ONoS3At0ehTGjEW2Z9CYok8w7L/DQ5eucg+JFT1/HLjKQA4WsY6V2A8iWpuqd0/6kRDsBFotZN2ThWrvDZU2+WM1OTIDZMWn2e50aw0uVMDn93ZxyJUG3nQImhcPfqnujWbQTm2nPUnyAOQyf0A+sSfGkxPil3HZXBS2oVWuKZ64zKrNkhKrhMc42orvDS1q7xGZ1VjnNET/G2o3sUPicUye7FnZWsBIEpeJt73mv8M7cs89IQjaFYacDdBH01ILIwNkc/ndw6UTORCjs89OATd09n2sxih1atxQnjpHqx1Ty21FgB67ww== 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=tBwcVpRb+FNE/4UsBgqGqCZds6j2XCtl/OzDwCch9R0=; b=Nhb2b5dAnsRjDdhCqP8AroaJKy9KPW6H35sYLEFZTyY/uXxR9mkN7H38ftpToFLG3kUe6XcU6sJflKZjZEXoMFfdaSIHo+0qjNQDMHc/DpLBi686uRXOdCDVjgTP8G/dAC7uAvjB0vLIBuSD7Pd/YTLiBykOH8tmnFBndLrSTA2FSeb7REx/5aSnp4M47tLQePj6dfeToK2N2vm6dZNtNb/XaD9bxhzudJqO9pTYQIKep2uRkM/S0a7gWhWVdNgu8Uw6kayN7L+jAuOGssrxQPqn0ryFTiyE7itNxLW30CxIJRv3rlzXG8S8X8kTJEADg3GycVQ3EG3Cuq8YIOiopg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:05:23 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:05:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QnFnbytnF6z66OTp0zpadJ/OyIr26Bfl] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010538.488975-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: c5e282e9-ffc4-42cd-87c6-08dbaf3e83b1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aow5JL3LWhNqsOlzwCrsIEGizA72uGHxBp/TZov8vgM4kDc+n0gbl03yRdr0ebmK5Fgh+cWSm0X3prgfCL6iMNqtWbovj4p/6hlbP9lmwppn22NOQJZx/nolKrZtVu81l2RQLYiY3osnb27bSowVbic+fQWj6t/pssaFSrWY04Oag2VIp7CyZeROGqSoQBQOCmWM3+HoR63RJN1wMBD5LeA6SiVxR1ny5O7y0uXYIM2lhFiNqKwIJOrzYnuL3zati1i+CYg7bu64dNTHOoWeVSLZ6QyB52wpAPQ28m/X7/INpPFBhuOHsa7EfMaarLKL2sudkP9EJlQECl2aEdCPcjkS3MEi6ck4NVxDvzHGRr7jqhJ1G1Yt2q7XWVPUSoaNh+pK6vmkO0AoHrfudzqwMpUaHfkx3NddobEc3lPXXYnmcqvPLjLPdlbw1U9C8sUgscj3Vt2PlO1G+ziIUjEA1v5trgF7iWA60mTblLXejtJY33BKEm5wAr2PtMaO7JztmxfXpjN7UqrFxpgDOFv4gDNmGUT2x9kViAHjREk3zEZFZ1DEHsDZrxOTjF0OM0NTmhPWNrJFnIP9yEHIGg8ov0HNxqWz0wxQ9ZfJvcsyRoLa+i3puHAKfY09LcpK8DPB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p0bPKH4K5P5Ado+TqcbcTJv0r3L9nvV1wmIaLHP/Tp8nB1dH80iPCb3H6mV3YtvfKhQCQZhpk+0o3cScg9W3aoKkao7iKgaVAQXOuI4XVEZ5bOpHdrYQ8n7LuwvnPVs8QmuvNHl+V7h3y9L7sT5nDfUrw+tLJohbsR48QZnejI2JjHa3kTV/WCYw/rIq2tLstbWg1QSBh3xk8hbi+Z/6fdzwnONzcBlbAdhYrpDWGc79LO0os6qAm7sSj7WyHPLLfHTJIP/Al978wdy2XlCqInl4iHtPJLSk0741vpcjFbKzF8YiZ1sxRSWREllc2HbDUuXaXVwHiGBPgXJlzOYCzfJOEw72xH9UWmw/2S414QqfOdGn4ZKNvpyQnVaako5f8raV2tOTCXs7xtr416tZiBwWENBSjxC5DHzwyVflCDOBo1bl7kvixS78zRsmNuFfjoNG1Nf5GXDpR8oqHQmGjZB7X0/gzCHXNfRIS63wkXh0g68G80Vim5LvTRwV544Tz9DGULqUvQL6gnq5Hev9mCqUJM3aLVTBxthhQANvwIp9YxICBIWY9DeIAVe788kk9FjgKBJxKFEc64pezpAFdB+e9/12MocZnlkjtF3fNPvI5LypTaCTaavfEsE3yO0PqRX/7h5tTu7WFkf9VMl4wQvge27Ti3xF0rSyCVgsr41Ip1fAHNwuwxql6KARStIYII7GisoRBwBnP3ltpyOmw38ITEKU5czAU6DG9ikbDRFvCUQktN710g2/uYFGGRx3gO3jYZOb7A4UwKbGsVtxXxvtmoDaOylxYNWC5+BGipwDeD52wGtQyv3iFOK2+8EtbZ2nxmJSzPTNYRoU3fYsz84bmNIbDAqvV/Z30d2zAx8Wx9IWJgmr141h6Cgr20xlyuyIoBFZm8oeZNBDFZ+szCMZMc0YbvJJs/RnX8pU0xDnlO/CCJ5DSYxx8E204nCurrD/YNwH8rWirSOYwyOZsTX6DoqFVTYG5wwTFu4wiwU/iO3djNj1pumv5MS41ZxAO2syOuag+YFX+KwyoqHcZpl6Lt6MFQZpD4kw9Y85u3B9vaveFnWldbh8+xD/OXbmWwF0fV6t+Eu5N2nwfZ7szN9JKfaFG2V9pcHpaZafMH+icNuBOuf88+EzPhagBQqwJ6a7xbtEVr61imMWV933vvxqfsmepwWx8PhaJb3GuupVYcVq5CGCbAHJePAgxQK8WTJLJVBbgaWPIOBIUNlUIoH/O363gsBDyx3/O8Zvwbu2O8PdjWKSHkIr1vnVnjD2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5e282e9-ffc4-42cd-87c6-08dbaf3e83b1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:05:23.7971 (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: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH v2 09/22] avformat/dashenc: Avoid relocations for short strings 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: 9s4rJesU+gzU Signed-off-by: Andreas Rheinhardt --- libavformat/dashenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index e98d54a61d..96f4a5fbdf 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -207,14 +207,14 @@ typedef struct DASHContext { static const struct codec_string { enum AVCodecID id; - const char *str; + const char str[8]; } codecs[] = { { AV_CODEC_ID_VP8, "vp8" }, { AV_CODEC_ID_VP9, "vp9" }, { AV_CODEC_ID_VORBIS, "vorbis" }, { AV_CODEC_ID_OPUS, "opus" }, { AV_CODEC_ID_FLAC, "flac" }, - { AV_CODEC_ID_NONE, NULL } + { AV_CODEC_ID_NONE } }; static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,