From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9F3E7473F9 for ; Thu, 7 Sep 2023 01:05:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A19668C873; Thu, 7 Sep 2023 04:05:24 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2058.outbound.protection.outlook.com [40.92.59.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6B6E68C83C for ; Thu, 7 Sep 2023 04:05:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdeGGWFIsbRuzUaTHSa5gwuv3oVTD0v5dR3RoQneH2Nto3RK7MzxozfyZx81M2aFMJ2VUIAzyG3Gkb1NBuyn+vP8CxppgnHh4l72bCU5NtiNNoEnTzW56505p1wy/tOIEIOwSFGcXDugTw9fZvWV1ojvZmN9fMmVFtuuhC5Wl8yQX7AD5/ATpsgRQVFylnNtX0pp3rjr83BT9IdA6o0wqZEhmYxr4II/RQIv2IIQ8eGlPJfpB5aR8tRC/GJ6jQsmbekLyuWuYIRkfLjq/l391GN8CSpmjFS3hjA3A/NG7PFVQVqC/4Z9n3GN2NUlz1oOV31ibCOIeuO9i0qUP5Zr1w== 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=OzjKE17KXgfZVYjHXksRs+lFap1RtUj193zuzaE5XeM=; b=iU23j3xmFnf79Y4n8+AfIFBtnlBNTx2ifwF3tQ8dhuczeZlmCnAIPi/sB3fCraV/m1kJ5JcOAzwL9pOuWNPLemdBgtNzMHO8IXB8NNeX5CUlls8KjrlXoONKGbgcI4wSAjoio8v3SddDpU0HBnhyTdUbOexJAJYl3430t+5qh3QFludKrFFmViicN+MxAt8iZaJ2PBNzvaf3hX5ae6cO8iFowLCfavsGJbLBQqYe4dPkqor4HdxtN0A5YXnO+QOcKGY5061BoEo0Mt9AaUd9KwP7NrfL8fagaEQvOe/TcU7RwZ/zPUodvV2drgLRDqHsCzfaTvhbWp28rfbn+zSf1A== 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=OzjKE17KXgfZVYjHXksRs+lFap1RtUj193zuzaE5XeM=; b=GX3fCUWDSBnL2zLLc2VBX1K+4c/iz3SuT3n/BAQ4P+JyE8Bd1fdaba4YBHtH5JPB3bOBUzMKfdynGbB5zBMCJGnhih8h0hrznOHK4akiWQzehr1KKckjw150XbB5FoqMGqH1/wHqYiL5sUEyAsf8yNk/STEMOqFk3ZIac4rwFkdC4uuYwDCYjGUsIUoU/Bz6sPzSbq6GCsIMTbDA90fKTLhbBTxGhYY7epqTvMLf4o7FOzR5ro/V/+rmZ0GREyh0vqRO6uRWCCDDKYwzUe0Yqiz+79z0+mbxOhes6GKRG9bQJi8bwqU+H/rIoemNeTFbefw/TT4c6hftQ8SBLQuR6g== 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:17 +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:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ayAu7lBzjI/aLPbCMEtl7LAChwVS6Xtq] 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-7-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: ce1db3ac-70b8-41a6-5924-08dbaf3e7fe7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oROIHfGn2eNRUoGjGsJKUq+T9rAES2bRtkgdN+tdtDVLH2jl4nILOJqcARMC9hKx0pOGujLELsO8O5mQIubcaHPLPA8plqYPiurLrzwPzTLoOwd8bw0J5PcPkmXGcZL9WMrUnK0DuGCg49k1+SWx+zanGYGee/ScDRAv8jiPwG7je0LwAVQ25yTy4slLSnAJYgHiCNs8OROf5dnK6w1FhnEW+In0U/OD2j1s0NGIDTozq2y3bnc2kHyUKK3Z3yWEbRLvpZNQiApFDYQXOkLstP+Zsb3LBKEFKKu+5z5zznVZnn6nAkisQYvC6RWkI2Vczfhd2HqmUYBU3LeazvWQ/KK/YnEm8R3mpksgHIovsUptEa56ylFdAnltdJSGWUJ5RD1qMBTbmJ4LLccmXNKFSQ2F+p7L+S5G1g5LEG7cIrsySezuhvuRLge1mPCeB5qsnPN7DkL1+DjrJINhpEfyUIywa8MxnLOjbHhp1tygkWvMaQp45gctgaay4TH5UOvfpsKXlaq0wmg3UKAhGK46r40kn0TkQiUniFaJ0THnpKc2769k/uk1s+1n8MiKSOh9RbeBb98V1WeFRHWS07OBso/6RZ5jGirM6GyJgGFTjPHDb+5lqfnhDI6KFHrkKne7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FRkGpNJDL5X88QC9gc1OBhk/6DiwRY0Ck3/adOVmNfMLbmOTy6ul907x+uN+?= =?us-ascii?Q?e3krYy7Y3kK4hITuaLHlyOedm2R05ywgEQgf74HwuzVunuRtyt0t3gqXSY8h?= =?us-ascii?Q?ef3AHq1XBo7CFLQnowMKRaQYZUNNihhsa0hzqwthGSCAod2rfYdlRs1o7/JN?= =?us-ascii?Q?6IpRwWk1NgRoUPeNfeUiaZN8uqTMtd6EK9Hmiy5W+hcxVGYPhX9AA5WeFk+B?= =?us-ascii?Q?C1zjy+Em/KDis7TqYrOrBHWToOBtvoFgBF9Xflqmu/uIGSENN/wi5lhYAGLo?= =?us-ascii?Q?KvE4Cjy0RKh3tAmqMKR+/bvqVEvqzx0OuUfLQBvYFk14kxZi/wIwnlX7b/Zm?= =?us-ascii?Q?AscdeCBtWClUrpLCt5mrsCPaE+zdRtldqu4c+dsjVq3EBQvBeKFkMdO9NX3r?= =?us-ascii?Q?UOC6XRjjD1pB3TusPfZsOaOZQ1//SGtMxINQ/+bujaVfGE510LGj2x3qePIl?= =?us-ascii?Q?uwhPh1tcRduQhhOpYl+sZCJIMoPHmWh9bqkwhCluMLisAqp4RC0u6cbfyec+?= =?us-ascii?Q?LvNBiBkWEyZDY0lMQhdWxsM55L07KtTgOEVfMIkpVabf+l9s0icent1gLhXf?= =?us-ascii?Q?s4FjmzwLKaQi+iYLEeokgxhkFXn1a3tspwpJMvhtzxfxVvnTnXr+R6ruuHQl?= =?us-ascii?Q?8TlaCPhXQX5h6flVMoDrZp6N+pysySs68C3JqiZzG//Jy/8hQJ28fxBMapQ9?= =?us-ascii?Q?Hor40XhXwp/7z4Rw5F4T/WaHjR2we7jwHD2SiFgXfSsGijjuHvJ0hIM+e11y?= =?us-ascii?Q?H/NY/niVy1QFCxq8HO6SVK4wQFgI0cHhKidlymczxZikyIOrKAqdTwuW2vIr?= =?us-ascii?Q?RNfWnBCWmpp7W0ku42uxswQdbymnU13cgftjuZs3N+KHCHqVUTKM4zlMZi2U?= =?us-ascii?Q?QeA1l4pL8OCpgIwiavW8lALE4lVxpMIU4Un+NeB2NPOAHgPzMyArLeSuEx13?= =?us-ascii?Q?pDpnGi1cd+d772kkTv9T1gvkHVED75gNEBItS8XuaNXZ/Y2KLI80vwndPR3D?= =?us-ascii?Q?LQlVEU54sRIvHIoQnhr/Rf4KQy8esJ1bfL2Kre/y0sgECz0bsobXQu9beAn0?= =?us-ascii?Q?gBDmEZKpCa59QhtMSs2xMISkF8Zq96ncmfx4GPiRK3x1rE9lim7gjDJQFldS?= =?us-ascii?Q?Tn+UQ9AYG3Rx5PRb3tdMeMjJG1QsGTAcBZEl6q6T6HsNowOgoWSx6HBGE3+v?= =?us-ascii?Q?fC1peR5iqLQN9V9p9lj3VjCVgOAfI3ff9tQJkrccVBBkOfX9VQlbiNNN5N+Y?= =?us-ascii?Q?QZ/ScnNoch5NQeTDVnMM?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce1db3ac-70b8-41a6-5924-08dbaf3e7fe7 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:17.3873 (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 08/22] avformat/dashenc: Simplify getting format string 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: A switch is simpler than a lookup over a table with three entries, only two of which can happen at all. Signed-off-by: Andreas Rheinhardt --- libavformat/dashenc.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 9c3ba2c389..e98d54a61d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -217,16 +217,6 @@ static const struct codec_string { { AV_CODEC_ID_NONE, NULL } }; -static const struct format_string { - SegmentType segment_type; - const char *str; -} formats[] = { - { SEGMENT_TYPE_AUTO, "auto" }, - { SEGMENT_TYPE_MP4, "mp4" }, - { SEGMENT_TYPE_WEBM, "webm" }, - { 0, NULL } -}; - static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, AVDictionary **options) { DASHContext *c = s->priv_data; @@ -265,11 +255,12 @@ static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filenam } } -static const char *get_format_str(SegmentType segment_type) { - int i; - for (i = 0; i < SEGMENT_TYPE_NB; i++) - if (formats[i].segment_type == segment_type) - return formats[i].str; +static const char *get_format_str(SegmentType segment_type) +{ + switch (segment_type) { + case SEGMENT_TYPE_MP4: return "mp4"; + case SEGMENT_TYPE_WEBM: return "webm"; + } return NULL; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".