From patchwork Fri Aug 20 08:09:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1033968iov; Fri, 20 Aug 2021 01:09:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE/P0BYa/FdOYi5gDGqX2BR6Yu7I+7xGznw1o1nlBZdQ27IGH6nhSJXpvX+ox09xTrUhwj X-Received: by 2002:aa7:cc08:: with SMTP id q8mr21032428edt.225.1629446988836; Fri, 20 Aug 2021 01:09:48 -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 bh21si6236693ejb.428.2021.08.20.01.09.48; Fri, 20 Aug 2021 01:09:48 -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=XdcSsCoE; 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 CCA7A68A24C; Fri, 20 Aug 2021 11:09:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071030.outbound.protection.outlook.com [40.92.71.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E2BD689F2C for ; Fri, 20 Aug 2021 11:09:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFH1vJyF6aThFhiL54TfqHRJVZY2mxYNhJ3MI0aj0fQ81J+O0uZAC2YiFGepINbSOPT1EF8S/OM9HG3LW+2+FDIyG7+jaUXettn1mL2KU/YRPSqKh+8zBEwGUV8ZwD0ycfRpS54xFeXIcfO0sPDxrW+gpeopqbSCaRV9Knec0bbglOT68/gQI2kSeianbsr/SRXj4wle1wy7JwzsTAKkgE93bwSoB1UhmHFhe/yfDlyWsTXMt/haHlZhrrqmbOdnc+mkLiVWws9BcCxJplyP90l5+WJZglKyc2PhNKwq2bhFetT4e4oE2/+3IcK2DL5ShlqLHbeNZpwgqbfE4Tuvkg== 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-SenderADCheck; bh=XdjyUIOMYNaSpq1D8HO9/K/5B6hzAC2dBngRU0H38pU=; b=icTy8fmbdimRrBApKZKcb9wYfsnuMVGfBQzDcUcx3vkBoKRZlV8imqhJIiG7LumofKoyIp8c2Pt8tkpoJW+vGH4S7GiPxOBcwoUwu15LFzz4aQobQ209E05LKa5dhsaxnPmWpHotCMxlsceydjCFl4ZxxYJ9O1HbgRF7PCs/XEK6pktgJSWKyJqaAeP1ECuH84NgvSTRhLn6FyfKRIbSOEixTrtlh1bXv/jJGsJfB6+jJCJjCqKvqp75CUli2+V5eSsG9pRuveU/8t+r085nB+x7kyR2apSXQusDzvAh6q4185r4AdEaJiYYJb5WqHUyw/9tNoH9RjeXrLHgc+Up7A== 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=XdjyUIOMYNaSpq1D8HO9/K/5B6hzAC2dBngRU0H38pU=; b=XdcSsCoEa/6Sx3JN8jXwhI26BNz+ATaziQl/iYjvxbYFlXL58dZa5V/oPKDqI37OZgjhuqHDpFo3yN53J2nhqn9LjGex0m9miOrhfOgr1+BrPPsw/iHcJiHb/4WbN+9eS8xxsmlH67AuFMHM7p/4Ro0aB0jPZK45vRUbYPJg9va6ObIbhFGKCnTLaNpJxpLVnym4Mv5/2Jd5oUmd5NODtrZ4aJG/5l7kOYBAJ8/nFhDzX9Wx/XCztpbKJ9ToV/ZR5z6xjipa+beNvO939iDDfLeXdADCZyj3XCrR4kFxw45KYQ9nDepUaG4CIwJUxq3gKGU82Fl6b0PZlOh+IsWIow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6981.eurprd03.prod.outlook.com (2603:10a6:20b:299::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 20 Aug 2021 08:09:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4436.019; Fri, 20 Aug 2021 08:09:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Aug 2021 10:09:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [RIj2T8XEAvdo0K0igfFizRO8QB2NYmd/] X-ClientProxiedBy: AM3PR05CA0092.eurprd05.prod.outlook.com (2603:10a6:207:1::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210820080917.493053-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0092.eurprd05.prod.outlook.com (2603:10a6:207:1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Fri, 20 Aug 2021 08:09:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 954b2456-bcf5-4c8d-426b-08d963b1d4f4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR+Na9ab5G77V3+FQhuTKDCjXAAyAXwy1MIVDOvuH4yu9v092diGHfR90kUb723E5jj1fTKYHWmLhh1FwdeAuW37c/hzi2+3KZLmNZA6I7cnNqB0KIm6c1B57QVB8K6DzFa3MvuGFWNFrQH/+dakqDuXqNYNrgT7+daBu8kkGbSvH3EfzfJUaRM6lcEN+4BFKYa4fqW6JWqVBm0z6LHHnE9Ui7agp6fjIio2IsSeUwnfyuxJFHTM/96BmfOgZyngJtN1bY0MVMAXCK3J5awUt9NAnWqYGjWHEVkomyVl0/J9R+lFhw1otjnsLaxvPhvnt7pFunMm9x4N2LpoLLBj+AIbiD9zSJApTWxbWaO/1G3ppOHw2zsVezIMMUwWhMf8EK+YEdbzQNfG9PZqyUEAsojWjUcVX1mIyDkJCY+cJkTqqzaQIQFxVUMpc7XpCd8Rq6ZzVycD9zgKJIxs/yRVfpX/FUQW2fGn1nKFpWXDHEUimp2lIkPxgnQbVt9ofzfIJIKxSwk207fCGDcGxW9vLcTui0b6OF76vRSaR3qjgxAgkh+fNK2MYgCqCX+jafCeCOamTIAnhm4lXe0Mvjo5/Jk/QEJHTFK0Q0FqtD7XVMIMspePtDadH9yVhDb+gcMVwxgpTzDqia3kNKT18/42PwtxuyUcJKZ18HQa2496yItswT53GtT2xSXANP40Fv3EAmRA5FrM6itJjUHpW2HhECN14qVE+M4A4IqY7Ph0VVCX4bJe22sQYdEVnVWVcEUNXo= X-MS-TrafficTypeDiagnostic: AS8PR03MB6981: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cuKmqViKl/hR7RB7M8fOqiPFNS7atehjg/YNH3D+/WyI18gMXuopQSfpWz9yOZtSp2FsiupQISc8Q11HB+KzaOu+PITvVMaQ62BT0czB9i1Y7O2N9SzLf58j4r3M9iSXtZvJoflO7EdYUkCakisMiC1VOpr6db7tvylKKcqZCgsLFI0jYO8AEoAAvZxNtMMytx+GEN/qxYF9d3SvRc3XVxq2onpgTUaESFIisXc9OrJuB48hMC/++8wknXA9QlK0EmkpMByGq0i+Mwtf3/ul5vNK5b60HnFJCU9YdM3P2fX4Xmwuq7sNJ7JR/dEoYvDNcwI7Atxgx1CQZ/nQIGBzGszoEqnY+9DnQC45QUKBTbY4ohTi1Hg5htg3T2cUN1EkfZL8p1VCJGJ7KGbbZ7FwZuTFjehWyrOKOq3fdDnJHuRnSDgHf9lB6cNtciv1nuAH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RYbevEnYhHeZBNA2lKU1b/1bLKLJxYVW6KOQDzZtecBUIsTj+WWJWpArpEhlWjeBrGMuG0XFtE4S4JshY2roG/8+dhfRzmXTOvyYQgXieVL8HZ9G8nYMr7X1Vkl/n10XpPmzRZRYk3AotdR2QIE14g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 954b2456-bcf5-4c8d-426b-08d963b1d4f4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2021 08:09:28.4288 (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: AS8PR03MB6981 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/matroskaenc: Only compile functions when needed 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: v1pKSkkPwF9m Fixes unused function warnings in case e.g. the WebM muxer is disabled. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 52 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index ad8a4698b8..b1735f3838 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2632,33 +2632,6 @@ after_cues: return ret2; } -static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance) -{ - int i; - for (i = 0; ff_mkv_codec_tags[i].id != AV_CODEC_ID_NONE; i++) - if (ff_mkv_codec_tags[i].id == codec_id) - return 1; - - if (std_compliance < FF_COMPLIANCE_NORMAL) { - enum AVMediaType type = avcodec_get_type(codec_id); - // mkv theoretically supports any video/audio through VFW/ACM - if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) - return 1; - } - - return 0; -} - -static int webm_query_codec(enum AVCodecID codec_id, int std_compliance) -{ - int i; - for (i = 0; ff_webm_codec_tags[i].id != AV_CODEC_ID_NONE; i++) - if (ff_webm_codec_tags[i].id == codec_id) - return 1; - - return 0; -} - static uint64_t mkv_get_uid(const mkv_track *tracks, int i, AVLFG *c) { while (1) { @@ -2833,6 +2806,22 @@ static const AVClass matroska_webm_class = { }; #if CONFIG_MATROSKA_MUXER +static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance) +{ + for (int i = 0; ff_mkv_codec_tags[i].id != AV_CODEC_ID_NONE; i++) + if (ff_mkv_codec_tags[i].id == codec_id) + return 1; + + if (std_compliance < FF_COMPLIANCE_NORMAL) { + enum AVMediaType type = avcodec_get_type(codec_id); + // mkv theoretically supports any video/audio through VFW/ACM + if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) + return 1; + } + + return 0; +} + const AVOutputFormat ff_matroska_muxer = { .name = "matroska", .long_name = NULL_IF_CONFIG_SMALL("Matroska"), @@ -2862,6 +2851,15 @@ const AVOutputFormat ff_matroska_muxer = { #endif #if CONFIG_WEBM_MUXER +static int webm_query_codec(enum AVCodecID codec_id, int std_compliance) +{ + for (int i = 0; ff_webm_codec_tags[i].id != AV_CODEC_ID_NONE; i++) + if (ff_webm_codec_tags[i].id == codec_id) + return 1; + + return 0; +} + const AVOutputFormat ff_webm_muxer = { .name = "webm", .long_name = NULL_IF_CONFIG_SMALL("WebM"),