From patchwork Thu Jan 6 18:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1908303iog; Thu, 6 Jan 2022 10:47:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxykwctvfTQbbwDBWaPIZzgqcLu6AjoJeCL87pmcnBRfJYd6A+i/qdYkJRmpOLlVzopRtz5 X-Received: by 2002:a17:907:6e25:: with SMTP id sd37mr47816038ejc.529.1641494864568; Thu, 06 Jan 2022 10:47:44 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9si936670eds.576.2022.01.06.10.47.44; Thu, 06 Jan 2022 10:47:44 -0800 (PST) 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=rF6o6DoP; 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 A5C9C68AE0F; Thu, 6 Jan 2022 20:47:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075091.outbound.protection.outlook.com [40.92.75.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B26468A927 for ; Thu, 6 Jan 2022 20:47:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UlDPJYQf3RkTfIYurKD5/CjKOUnKn3xJSGMrPCzrgizp2x8XtPTvwjiCESYEcTAC8i/m6BC1m3wKI9Ud5oR82+J8xcn6CGzN10pN0zhSs6ahJUX+pqrLNOGiuaMFUYGoCbEJ/tWj11qvEmJP58Cop8Vv8WyWmkAdZWOYHsvxgEbNffGucvnzmDLhX1kjuZRPKAGeyYvskglf9T8Ndc/XXpjhgrEIdORET29/t97++zpbRrIiMtQV2mvbsNtbbk6mAlssGgp/MzpoHg3bVOUOmykbO8lxYhJpX1A0nFY+n8ks8pZRpM5owhwmPEZU4C6Fl4H3nijMxvuL7rhWE9qv9g== 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=eFLajSR2Rg9Cv3mVH5TYK3vb8gP3snysWlRNqfRhtL8=; b=CLxjzLJojPDNz0hAmkJ5o9iJgZ36IGg8kHYmbUcasA3QQKgRxJfZDnroc2pYo0pNujvxFm7CUK+IINILgwOOpAT6PLoUhcuhlgOuXXrXdO7Ck8l4+pNkhupY1XyYABVktqz6a0T3yUIafQSX5GeL/Ry5n7l23MiEJhk9uGcUZS2g4lc9fRLizBwLLt7LmRgUNoGhw+DkfSC7HiSHjA7vsSYuEDjmxp6HRSNa5fGv6LBHGBg2ilvDg9zIcRZToaRDdtYln8/Wbn/VdxeYE+ArbiudusCyaeC82W8niFOdSOMv3UgjDZCDAmyqEvm9EEU+27hWm6Fj4pHGVKiruTSCzQ== 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=eFLajSR2Rg9Cv3mVH5TYK3vb8gP3snysWlRNqfRhtL8=; b=rF6o6DoPEeDQWOySj+aAmiLl2rtdEtl3eUWfPFUtRLoC8pcRtmGLx0kXkeSpawnCBZIPBGNA7yEBNJnweEEmUqHmFjI9blH1Ll/rPKUU66aSC/wOCJdWeIjQgH2LkLK3+8m+A/dJ+ecTLpQo2puEwgQ62P4D8H6qtlEDJdQxZm6b92JyhG1u4XdRbx8mdrYDmbnMh20Su1dHWS5UiMR6TC5kuwAo98lcM6b9F/sblkzWGhFQR+62OYI1RJk5fDv15hREz4Q2XxWGPUIMVVqSiiNbsGYDAvGRWaiJxVIpWUXypHOzFxeLeep+yLYtGCTFk9keKPyKAUuyYMuPYzLfeA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 18:47:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 18:47:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 19:47:12 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [n98nP96Et2qATO0q7I14dxrf+k/7LTko] X-ClientProxiedBy: AS9PR06CA0045.eurprd06.prod.outlook.com (2603:10a6:20b:463::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106184712.2025099-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf59b729-7b64-40f4-df5d-08d9d144fc44 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybKR0TJbM4CiEQ3oXWqmJgvPIVUcWBwde0QHJNoVSwq7JHneeQ4Gf46Ss75+UKZJInCATR+ZDwo9Wok/Ifi0STW9LvFTgaZh8r3aWF/jPex9zKSmjnNCYCIFzUa7M3JFDHhN7JOZJ0J8ThDlNahqqqgGQbFTlX64vxXhklagQfwfyZ5gjpMejKNftup1V+2p2AY5c4oP41nv5KxYdqR/tF7EU0P2/Q+4fas3Suw3w6aStqZAWYjiqzqaj+VHIYaSp1of3qqj53/1qBZ7w0Xg8nvM68Oxxd8Z14FDRyiqk4sRbUkgf9MB/87mESPVWh+irABJ5ZUSTy/sLyNwvrLWvKzaF13BbU2MmPXXji3mfDcK7AH2pQO59N/t//IRX720f7az/zobLcS/YA34SGLnb0cp1q8c/nXuOa4nhmvm/+qXVaRfZciAwX6xvkpzy5r/tOiAKKSbFWno123z5Z1UVS3vS9kVvfXWpqNnS1/EWX9/1H1fLahUx72JHICUeLxBEcQED7Kma7zZaBzpLWp7fI77kD90DKWGsRPknx++lu7WKtYFIkSLkRmP3s1n8evC6Myr1YniZ0lnNfp3//EXHfIbAyo2AF2vgaBjNw8bAB9s6ThM0/85jA3bA7lLnBisKNQ3eXBiQlkQ9ezqi9Se4/X01tCNmfpRhBJox0EN6qmiitFAEbNUo4HLo4KMF5VSwa5+nPmjDlwzwFUKq3Pd6ZOiE3v62c48+xhvh4bV8rtbdYrOyq0DQrtsoTihSXJ2Ls X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VFNMwl3uY6fbBFrex8HBJWYbuyy6KcVG/u17ZJUXVlMoqh5LncW780J2ZfltAwbCkEHgQWV+B70m9gCufwOrEmY3/qCEk7q/IyeqjZVpmP8aoe6zf5he7AfZBzPCd3geFnLE9L3kzlJV96+ILn+jotEYqyk/NJHW/DDMQuJJeviEHcsRZpaIt70QDpDK+G5HJsusyN/ChVDqLS0dEDnhtPmsI9wUz5yJimT+B+zqL56TC9tooKW11erJ4PR7r5vkxEThnAUMkRf/EnVhXCNjBWWD3spayfe1dua4kBAB56GJl8+1xTO6ApAwk1Z7f8VGXESdSkyjXMJCoEPFbaq+uNZwiBwuGJfMC8Xj50R9feEPW3g13RgkLexE0ve1CYoRb5NxkvbbfufKcnddtE28p2vRsuPSPKgODMoIchCcOSVm4JJBM1lPtNvv5KRqqi26HjCkPZw2vWrs963k2UHvw4LYu9/0SVPYEbLu9woUS/ZD8sBX/8g4zoaNSJLti4R6XAPXkXAPSCHexVK5XCZwG6qvX+CPuacDOqLM/kyzBlT8aBRmZMG22skVVK3V5o60tiW73zPwhA5sNRSDNdg3LQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S34lOcZSZ4preQ6zdaBtUYZOGpZIMCWGBfbuQgapjrR7ygivd2lRuY4ynY7rT/MhtBKT0yZfliqkJwtB3RbcYm6c4lLK11Iu2b/FBuTnfmApomW69VKfZZRRNgVbME8NYJ4/8W7ToED1zK4WYs5AWZAWXcv22FWSt8PUM7xW2qF4uAhcyibX8F7v3IqYkPt1YwgBxyiMjvAIdT+2U6DWyGasYfRHAK/UKsCvtq3QL465fuycNxNdmU5MKPCxPc1FZM8H+O7IkW8iGiVHjBErRWMegQ+95NeWtyfb11eryblTFGEx7z8Upl9ZJ0yIlUpTArjnpeEz6VL8YcdrjOFkaq5BSsFwimsZWy6Nhhrf8exroUa9hAlXSHWQLTHCLibR4YuYqyB8irKumuBfzuUHjYralV8NvR4UnTQ+swx9o5KNUczdbX412aJyb7/fV4x3QKNEsQ5Ofnj9tpV4LOVPkzwNclIE2WfZowr/AAFi9SFwN5gn3GPteJOobJ71NIhorroyBwPU2GnwAZo6oxkSZqhfI3wCE1smP7+UspHLROXzbp4UG2LrVm/p+Oa1YQF3niBX+/MN1v1VSTUytYi76B0ZV/JU6uZqFcXLHuVE21ok/UL3jC48EMa5FwBR2VSZUMn3GxYTvZpf97uIeLvQCvxkI8vTgbepH4b0wHZSD3AIvOv55PuhGt9kg+81KE2atbChCxTkvs69wFwRRP4FxSo4S7TkWuG/3Vshev76VKl5qefZRiSJ9L/70Hx8xd/g8X7XTer/l9VVQnXgxxjmE0ToMXigRvoxtt1EFPikkLPOyN1b+AL1E4+8B+tbzM1Kiko/1CDHYZZI4ZYR97UwnmfvliXCa1OmG1ETSx0k/goIIvPQfW0RulPu7NBJ52OHW3+WiMy5RpnmrrQIMaOxNc6rsSolZV+bCbqXXJi4ibM5gXc/ihw4F8IosD7J+6va+8QEBXTp+R+EhY382bXngg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf59b729-7b64-40f4-df5d-08d9d144fc44 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 18:47:27.2033 (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: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 12/12] avformat/matroskaenc: Fix build with only WebM muxer enabled 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: sOpflTOtFAUt In this case ff_isom_put_dvcc_dvvc() might not be available, leading to linking failures. Given that WebM currently doesn't support DOVI, this is fixed by #if'ing the offending code away if the Matroska muxer is not enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5cc59dc9f8..6ba1dadee9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1123,6 +1123,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) { +#if CONFIG_MATROSKA_MUXER AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); @@ -1150,6 +1151,7 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) end_ebml_master(pb, mapping); } +#endif } static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,