From patchwork Thu Sep 7 01:05:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp297061pzh; Wed, 6 Sep 2023 18:05:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJ+AllXkOKxpNyLfAwG2ofJU06BzpXGnmIEnVZEp7ysv/IC3XbNWDOw5K0Mz7r/ZyPjnW6 X-Received: by 2002:a17:907:a06f:b0:9a1:cbe5:758c with SMTP id ia15-20020a170907a06f00b009a1cbe5758cmr3516292ejc.7.1694048734436; Wed, 06 Sep 2023 18:05:34 -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 fy37-20020a1709069f2500b0098e1627c0e4si10602933ejc.777.2023.09.06.18.05.24; Wed, 06 Sep 2023 18:05:34 -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=ATwPAhjv; 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 65B7268C809; Thu, 7 Sep 2023 04:05:21 +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-am7eur03olkn2058.outbound.protection.outlook.com [40.92.59.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64E0C68C6F8 for ; Thu, 7 Sep 2023 04:05:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUMQMoFTigikCyuJa5YBY6KG+Iw/PvA4JtkH1df6adO8V+4wHn2OVNgth4ZuBmXPjFKJtS9tVVr2j7xG3qNFq6j2Dnt+hqYzlpaXwbjhIVN4n3PPGs8V354XwGigPW1+lP8F/0fduwf+OwbZ0rX1JBK+rt7hgJjQd2tn6P6s3GSvem5ZyfEKC6e7vuQLkqWNi8px8bgal1uh9O5orW3NscvTz7q2eI7/MZMwkfcxqNQSE36pSFrRLSdAVJHNgchv5dCzAVKsOJg2A8TQXp9RpkL7jgInhi7uRe+1SbteoyNVRutYmC2vBXFY1gNOXbndluDcsQ+y+TSaP4D/wEN5OQ== 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=sO6r/IpcQOnwlte0Vn/LpDx+PnUC0UOIVnl09f8p5PE=; b=LKLbMIGrPVJ9KQf9UAsdoBpbRo+OrG2yh2smbk04Uz2EFrMvPBfTI+pbH31+0C+5Xefb82q/Rs/LSintRcoL/ipy9Fn2XSezQHyMI7kU0ADgqnL3rNz4ya8OHf0kTiY4NUy/Ze00hBmw7ch7Qja6duOLteUB1XDvmfGyThG4IkMSYxpv4vV8poJPZZoXDL6vTZj86NWmUk0ffhhwJ3Ozfg2BMuDPLF1XOY2QmfNTU+3HofDZOmXMKg5QepSEFXpFiWaj7AprT3521yO1bHiIamN9o2LdLFl8c/Su2bBZj6+rq0K/zt4nQ/YnvJipUje11phwODdXn6cigMTWBnOwmg== 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=sO6r/IpcQOnwlte0Vn/LpDx+PnUC0UOIVnl09f8p5PE=; b=ATwPAhjvC6vMWViIfOESy+i3oOoBLaO3oU4R5pTjezKdtiAqfXIVogeTiJ3OIN2dC030fmr9+K0ma24Msjam04lYlUH7fcWblxisWYnUZ7w95N6YdCToud7G1JuvpoiFxJkxl7mNGbu+1doUqQhKqHtMNssK/zQ/HW5P0Vf+PhLK6gPXv3OmM2mEK+44MfsxJVKfhtvMLUx19fiF8Ag1+sQPqWkvYMjvmbXT/I2aD+9Tj5E4PptDY/yV8dcqVGdhraRRa8jNXddWskto8rEMOn4sJ9SmzT6DEt8Cz1MSyJGB/qU4V0vbO4f/+fRu3cwd/4fg7z4yXhTE0s1oKuzFCw== 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YPMuTVPfUML9kuE0vfn35WS7tM4F+8H6] 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-4-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: aabe0a11-c43f-406d-9b41-08dbaf3e7b84 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OeRaueIjqnujbr7f8VWLlj/n2l52a+yKhOKsn3P33GXlLP7dhpEh/XqZWmVCB/vKu4agBcOIfhCYZlO1MBOijNSzasnI0c4OTmwWYTbtvW/25UQlN57KWCkVUuFdCOCNdytK986Jo3VxxRrxXScXNdm3qV6YtyXHerlSTqzY1pYBXLd1xvrWiZ5mEjUw8P2lIVkpi0Wg1tCY2QgErgx7DzO/8PSAOtPF6EVl7jqnjKKPZSSw8aZMN0By53W71RgXsuthN/JutcQOortx5amu3cAkTo0hFD/Xvnv0yjC4J935HdzzsQxURdevLTKRm6q3DaNv6DN9fX6vod7i4sRGmjX/aEX5x9p0+farq1HQElJOEKyyiwNMAnFqQ3pQXCXp6fqkfaPeli0S5Xa8OU2bBxN7YWpZ2f8w2w7aK58hqw4SR1kovrMk9ii4zPY1kDJSS13+3Vzf8wiLtl57pmgMTvhvlf/E4BGE925S9Z5ZeZfVJQK9xlw8VQYFTUNEzUM6u1e6Ukscs5+9YHPeszG4n7j6+cp4/5j7I6uH44ajH5lazhf+xO79522kXdrNDx+nC55J8nmftSzyKpMRCA4+Y9jtewxfL82ZYcG40reCimGQFhY8ZnfHU+vTQsueA7XK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nTuq6yhmGxuOQTSPEqE8rYKeZO29sAyYxo6MbI+eqWsB+euhYbztK+Ru1xx/dLH0jbfO5Wl+j71mxfz6afd2P52i/YrTIMOziiJAD7Vb++vLbjGG1+7ghwUND7xuDZ10zuKbTBZ4nHJLQ+5bkmU83+S5LaeA0p9MeihpLfRsCoj8BmPicqr93pAyjz3UoQFQxq/n115YqsiJ2pmn76qbv1bVUrR7VzgQaZoN9qFhkfGGJzxKk3z3t4gKUF2Dczsrq1d9q71os8MDKKzf2eoptnGCLhJodcCSLJkGBUScZVKhBug/l2JS+vXYAN+iK6MxZVLqaeDRiVfW6/u+vgy4OAdVYhV9kuO2aAFmDR/U95SePNw4QtAOlM2t8LEDJ4suAG1kzMbxFf00KVk9izaS9w9S6G7bKA/qHIx0eatuGb2zjoO78/tf+7ngZnpndjR2oFMRdQ95bT2yjp1YIAfOkZS0by3y5YFg5qpAlvJ6fjYpPJK3IoMB7Eoka0dNz9sR73r2CV3d27ImWzYYT9oU1pVwVY5svkuqiylUuUHtGWkP5ca12MZnE79wktVrQhVhrO9161APXEmvYsS03T0laLwvD+T8PVnY8afl2J+5+YyKq1uj5JlQxjJm1taQzKJIF828Kw1eWSyPwzCrYM7j7oNYuX/AVcVWYRdS+HemO3FRKWzLC9MJJjliPnSG/VtB5g9PGS8L7DVYVZnHgq5EbMJwOW0DZwYZx2KZd+wzl6Z8dlKk8ikq4inkHw7Kz6iQvyDATa9ZZUTaJ8OOrC7TmIZQe9JFXedbkUjEvpfz4jEU9Kg6ni1emwPQ0nj3ZSjpRZ0Mv9oGRMNOrs9H96GGon6JErFHl1z0hh7BBGp/3lj6Lo7l8FnpxC53XHj0Ya7brq5N9v3EBLWsFL5N3pnKxfMkF53QsqWMWI+c8yyWoMzRHyj7Qe+fS13a7G9z2cZUg+RKMhvsKT+QijXm1YQ6rH6wUhuOOT5/jJNSLmRDnjELO+8UnEhbdpJfcg5qSfLFN9YLolI3qDTbfFSAMWjwGi/CxmXt5n21tvFGshfftV7C9wUyde4eHvZ5wD0vDlNCTDbIXJGqdbAeL8QPsQ0+LxgRY7bjTIwNZG3nMpaDgUBQELQ9/EN6r7cVy1P33BQSForvfbbfy5qcOK+g9N912px1VglHTdzIh+YvvAosuZ4CSB68mJLabHKDckgecvZJCB06iUaA8IEzxqMc9gjQZx8bOEhOxzE78KzUgUZkcar7A9p1pJpddZiQ8VcScsVj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aabe0a11-c43f-406d-9b41-08dbaf3e7b84 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:10.0332 (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 05/22] avformat/dashenc: Avoid unnecessary casts 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: 9B1+k9jDTmC9 Signed-off-by: Andreas Rheinhardt --- libavformat/dashenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 69ceae2cbf..5615430d86 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1292,7 +1292,7 @@ static int write_manifest(AVFormatContext *s, int final) if (os->segment_type != SEGMENT_TYPE_MP4) continue; get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); - ff_hls_write_audio_rendition(c->m3u8_out, (char *)audio_group, + ff_hls_write_audio_rendition(c->m3u8_out, audio_group, playlist_file, NULL, i, is_default); max_audio_bitrate = FFMAX(st->codecpar->bit_rate + os->muxer_overhead, max_audio_bitrate); @@ -1309,7 +1309,7 @@ static int write_manifest(AVFormatContext *s, int final) char codec_str[128]; AVStream *st = s->streams[i]; OutputStream *os = &c->streams[i]; - char *agroup = NULL; + const char *agroup = NULL; int stream_bitrate = os->muxer_overhead; if (os->bit_rate > 0) stream_bitrate += os->bit_rate; @@ -1323,7 +1323,7 @@ static int write_manifest(AVFormatContext *s, int final) continue; av_strlcpy(codec_str, os->codec_str, sizeof(codec_str)); if (max_audio_bitrate) { - agroup = (char *)audio_group; + agroup = audio_group; stream_bitrate += max_audio_bitrate; av_strlcat(codec_str, ",", sizeof(codec_str)); av_strlcat(codec_str, audio_codec_str, sizeof(codec_str));