From patchwork Thu Sep 7 01:05:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43613 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp297055pzh; Wed, 6 Sep 2023 18:05:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEjGmXrKvCZI7O2SmqPGmoKxByxkc88Yxu8+/2+xbLtt/0fO5AEmBwe5aYq8kSzbp9iTxnS X-Received: by 2002:a2e:3518:0:b0:2bc:c1d9:6848 with SMTP id z24-20020a2e3518000000b002bcc1d96848mr3137502ljz.44.1694048733721; Wed, 06 Sep 2023 18:05:33 -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 n13-20020a170906840d00b00992ad2f72fesi10037598ejx.537.2023.09.06.18.05.33; Wed, 06 Sep 2023 18:05:33 -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=gG1cwgLN; 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 8163768C835; Thu, 7 Sep 2023 04:05:22 +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 930F468C6F8 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=ihwu5BknbsRJ+BOClN8ozlny22co1hQ7YUA0lZtdL3vWd36clv3xlxhxtLr4fls7hzyFav2y2/5h6L8tc7abiTimet43dm3GTIkSKtuhUAjsVCxP9p+gVwpcZu9spGM7F+nS6rg07DsbBfzUR8GUg+9O5a4cjIMZEJR2CTJmIOlNEDW0WVdc33ldkgDg2GMshB4aoSRJW5Sy9mM7ZN+6ycy3LY1Q1xl/uOOLH0rglyBCZgTkrXfiOJf5LueGpBlET6FC0ceShQyp7YlAojEPSgNioNDuICZ4UYIodjP3hlz1kZkpLImNDYO6o8bEuOuGRYp2R06ehsWZhf5Ydkybrw== 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=f2sPHvYn/gKloS/SukdNgov0K28m/eBlzEqiRvGJmgQ=; b=KLQ+5k3A5vPk04qbIZcPDOPY1YqRvZYnR0S82g4I1QQ+R26ZhsKuqehLwghsz+R0JFF545VnRchs8ZD6NfmoIKIWcxMHN7QBRp9MT7oWNmFEoT35x8dYnMeIhBOIG32p3a71lj6q+cgpVf5MhjGqAX176BCmNS+jDwOrwWzYNRTgkzww7q+jXYJolNfSZQJBaYr1gi94/3xZE8+IV40QBXI7OjpCIcc1Z16D1mI8jkbT9OcPecsyWZYpp6RcOJa5DMxKpwfKtVpKQ8OIyfpluQfIo1vHv+XPuynNrZaWlIa4Pv5m8H6tSwrduOoxebZuLluUbwLXGtwAq2FmjZYqxg== 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=f2sPHvYn/gKloS/SukdNgov0K28m/eBlzEqiRvGJmgQ=; b=gG1cwgLNR3iBf4QktsACEr5+tde5zKfSgUXOKFY7fZjJ6m2OfvB03XE5N+NxzvH2hJu+Q/MvNwA5rlbZWwrOFY9T6o7mlPRBlNzjlA4VHT654TyQrqdurhW1IrcHBEzRilRjUir/3+rLyJQF9TqvFtiyKhb+XyEJVrDccQ8yDRAs/WX6iFFrFSZLlPLxshtopcAnb0HZJ/JrBzZu+dktbGCA0l7kqsEv72bPQ6JRgMJjRDUk6PvPQMUM7/xFrfHJXEy3VP04BKrD2DXO8NfprnJQIvbj2h7ycU/4cbiLpur51wk8eFkBDvwr6tG91ZwoDXFEtQVPLZ+YN+whVC2XoQ== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [uTjQPUDKgtHxs+N4drHirblKjX0vnNDE] 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-5-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: fbeb4316-d937-4dfa-c186-08dbaf3e7df2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kcMpkz71V55dpBaBk0DlgEV6XRYZGqDJBF0wPrCLbamTQeifdXvUvDs4cDGiZR32Tl91UQNdRX9uLQeyJ2ByhRG2Mtl5GBcumsjGzG5kTKiCZY3Iz9gUaCpOrxGUTFzCSg7hE9YJxkYfCYeOWBc3wiMnpd26gqmgAHaAPBmz3BUg3b23j4N5IGuCOrmi4r03+3jqT6i1xpXDHgyJZrpQITnJ4YxHNHAQSmSWxmRG3CmU75IecYf1W9x1/dVSIwZNIY7LDCSjrVnwa7GeC7Gq9S4oYdQqBVV3Ec3Ias2a9gESZzEUPeByrCK+VQDHQ893LuTIGxSBza+zk5essE4/CIWp6IhUw35bnzqmPWZjVaqnjuvJbd5+IW1EGI/2b7wkcWKYU1tris5/x4La6wImJ+ov5VJ8/bFkb++Fw7/opiZbGEjGSvaEWqBoDKq/AxCXkghxnevCSmow5tbEXwBvu2gAedsGX8VmL9Rb6GqGspnkUofpqab5jJ5CIhn0ZiGOLztGLrJk5gKLyhkvwHpowXeXjju4OMzav/Mx3d4jr/0lG5jAflXWVOhcs7lO0ePYhB0XCfiRaJTKeVgDiNfgMtjQVucLyc8Aa+McxeuE60/Da6xoK6uMj87gBkXm6TlV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tPIOSxYlPEnBB3sfz/5BU2I2gFynqaie2FhPUhnpaCE+0CrS7EOejGcbCVoxJyaUnLKLrAkD+CgxoB5oQ3c4rgkAsjIQex39SknxkA7McmdGyKUCeWhFZxTpbP2tssbNZucXvDOTUA0SPL05/D9c1wMWw13JklYx2lmjJUOVJ7gMb/FKwuOM3sESH6pscADQlrASK9MzQ2Fau14QxxNdh2dOJUphFT57LLlCyGMRSUhgA9MDVy/wrASftB0H6zk36QLuTGjbigIqjBX263B5QjQYikc3gLTyK0P6kCBXTheFZOm7L2r3UbPvTlbLr+awqCVIS7votPBV3MvmWjeb9pgAuot15Bt3Tr5KZfIyNaRpQbu2eFbuEGhRspNdm9h38HlW3JfXoP6FuGiv3uf0JsACdXv7Ss3m4hR6ppza3S4t1kCAfjQD/xuuGBXXT/ovoOezsDizywcizgqLKuz0k9lAS9ne1vsAfoTofANuowHSpBajH5fYNk03LLL/hw51SwnU8+Gnx1YCTfA4rxRtn1vjMLJBqkM6/ZuHYWyaqNRmRg/EIRZa1gZicKBZyzITJF1yZKzMuuAY1pjLCB5Eb6Htssu+7pRSWOzF/cGQw1E7LLTbnOwp/dRlWCGGgIn59lNPl+8lOd3BSP2fJulJPE87t8xbho4RAfknErtGGGm6V/TzQa/x0EiQ4bxtB41v38+BUijpywrnmnT8QptlZw6Eh+og8v8NXCZm3PT7HkChC6m2pJHEWR6jCU74jYAdaA6DdkcjsoyfqM86s7eCI7wGiZ2ZZI3oR86s2E9Gymq/Cm7Xwt3/55bo0LgMpgnSSZrkfLtSO88hq+mR7VHOY1AfShUGHtW4IoTIWFNS4l/wj/ojCqwmnpIqXoLwJdNBe35Qak8pc9K3+iXLcy4skFzQQaNaUr3p/xi3TN7EhWXjQO4d8Z4ZAY3KA4VMn/mbSd4dLprWEV5J1xEaafK3f1LJfNXOH8FaoeamqG6M+aGWzk3kWPBOg1spwAn9f94LBHsAs4jBOCJmvSgjHULwmhKz7YXWqBRgo2lthG1R9IKdAgy8bPDDjDUK6KarIREao2bA6iub+wyWCfD6TBrjCjEWVnBLEoLdNwZcpcjXTsbH2vlcNorlGM3EfrLNfTif/wOJ/yn9pv67DP8fueXY1G80RLJALSJHGHDwNHunu6X9nvh6NYfQSlNbmcMW2tB8lJMe67+F6usreM3WhZ8+7OmO1YIVtrWZAZPqHP68r6ECSCPeBgaSlYrfm7uRdani X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbeb4316-d937-4dfa-c186-08dbaf3e7df2 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:14.1468 (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 06/22] avformat/dashenc: Use proper type for AVCodecIDs 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: YGcoED81AOdt 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 5615430d86..1fac35a909 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -206,7 +206,7 @@ typedef struct DASHContext { } DASHContext; static struct codec_string { - int id; + enum AVCodecID id; const char *str; } codecs[] = { { AV_CODEC_ID_VP8, "vp8" }, @@ -214,7 +214,7 @@ static struct codec_string { { AV_CODEC_ID_VORBIS, "vorbis" }, { AV_CODEC_ID_OPUS, "opus" }, { AV_CODEC_ID_FLAC, "flac" }, - { 0, NULL } + { AV_CODEC_ID_NONE, NULL } }; static struct format_string { @@ -360,7 +360,7 @@ static void set_codec_str(AVFormatContext *s, AVCodecParameters *par, int i; // common Webm codecs are not part of RFC 6381 - for (i = 0; codecs[i].id; i++) + for (i = 0; codecs[i].id != AV_CODEC_ID_NONE; i++) if (codecs[i].id == par->codec_id) { if (codecs[i].id == AV_CODEC_ID_VP9) { set_vp9_codec_str(s, par, frame_rate, str, size);