From patchwork Sat May 7 11:27:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121397pzb; Sat, 7 May 2022 04:30:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUZ0NAvBtggObzY4lgWcI4SQQQaVWdkqJDIIpSpRMNng4sywWt5n5wvrMnNEo7r0eWZqQz X-Received: by 2002:a17:906:3087:b0:6f4:2901:608a with SMTP id 7-20020a170906308700b006f42901608amr7228729ejv.646.1651923036674; Sat, 07 May 2022 04:30:36 -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 ne41-20020a1709077ba900b006f3b3d81aa8si6223367ejc.216.2022.05.07.04.30.36; Sat, 07 May 2022 04:30:36 -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=FC7MtO5m; 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 5404468B41C; Sat, 7 May 2022 14:29:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2058.outbound.protection.outlook.com [40.92.91.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AC4A68B410 for ; Sat, 7 May 2022 14:29:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NiArWo/h9+lKcsZigggnRElDIoxnf1de043+aLOTUCtaDXnITDwBiCFGC7L59t6XFB7qRiHBa03UoQvAN7x8Anxyrk1sej+pTNDhgFRUCPemzNilAypgJedz9EIv69GVLAn+TAUpn4bzzQWtiExNQgjs2Dgo/1vnThYfmooAgATmcTm1AOanp/yqirtg4/J1LEEi7QNuSniWlD1yX09eCdmQV5yHv9j9B6H9waBugSDzbHjBvvKPaMro3g2ZYh5BqHcgtXq4Rp79qrijIBnHbjv91iYlkYB4Ri8nLdM7BA8q/OA2xdfwhCSDF5wE+oGgE2e+KRivP4v9SkJrLKNicA== 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=2/iO+Ai+8AGFbM3Q6Bippok1BuDgE4oHTU6FHYJ10R0=; b=bUOsidM2aVSr6gMj+kLfRRMT5mLaONnYg8/RfAbw2Qg8zrC+e51Ym1WNki6vvKGEsANfEKWJpurtr6HdfOnazK+qjZ0ZsX7eJqapeSz/MHzjrtKT5uy/FUn1p4tr2BmTSj+HWurAg3/dM0NbtYHovTAi0GAOTFw/VNeS+r97jDdFbWDhZEqneM+k3NZbbCfB/dHOD7R8nYIANlX63xVXTJWUvUU0yV5Uzbignt47uYBBA3QhMcTRSmENfgQ9IPfFUL6dKmFjrqSjUyAmVJRdRHU64BkkZZFwTWLDvf1TwBMzDR4a4JYAEkvyDsKiRIdtErsnuyHMt4CA2AiPGrxuuw== 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=2/iO+Ai+8AGFbM3Q6Bippok1BuDgE4oHTU6FHYJ10R0=; b=FC7MtO5mxDlje8q2epNbCaSDjsa8OMymRVxFyXWLZ4oUujt/m6Nh/bGkBjUQ2OOKTuAmAVOFJv6V3Qh1WAIctknqtHvD/olvAE7Ud2jPmFWwN0oPjziRbmURAyPavEF+hHN/ZEr2cMOUP0RGFxnuEX5EN3LrgAf/br2Rs00JK2RYSQvyHqoXsLqOOA2SDCLLJU75E5eEyxTZfU4w8MY9+8zb7eD5ZvD8HIEblKc45PSMZUlxV+/lpC0kDi1OtbVKxKMGMSUpme0YmBQG6hQZVQJHuREwtA7j5UXZ0h3CAQemQEQuDVBPFzOZtorXRWNCHAj/hjyzLr2n+wOGjhs5zQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0102MB2663.eurprd01.prod.exchangelabs.com (2603:10a6:6:e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Sat, 7 May 2022 11:29:17 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:29:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:27:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [szDwf/tjw3y0BAJPTI6f6tzfKqAAcGi8] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32767479-9d5b-47e2-9fba-08da301cd1f3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwWbkmEG+U8jYOFKaS49V9aMRFQEIt/Iawo/EHuF5qOtcTUH6qu2PrPrIa8oGHYFmFNkgv8eTl5JWv7Vt0M10OewH/sNt8izUAWQcM+pwuQBk4iS/KnlQDS4y7n30iAiqQarpKUishAzq8IGcHYVNmSmzlQXWsOjUws/eqFqxnARv2IQ5N4qbQcggpwTzGkPRzVAa8edsIGcByoCxL91xWLaruqRnPhohMB6GTBWpApa61LB4diDP1c6gD7CuoeTyIIDJQm9FbYBXrsVNjgDKnPOwKrCcsIvYiB7QPQAaNO9IxXGUIETdMesdcclBRfEDP076d3HbSKJAHzhu0x6YLyH/2vVIS5tp3/EVzMuW3dnDyfDAiD1P0oxAs0ix0zYcDJ9NGE3jJzUJUO1VzRJ+OmXogOk5ejeMlfmDxOFTJY2JeMBgh3G6oYD+xNLzudwaPEQhXZfK2UDRitJkL6agBOtmxbFKdsMecW/VsVHGVhW+FZbBz7erCplULiHPhi5zv4DvoXOq6tDh6j7vsmvSS6d4mScVNJpWD9XgLLb69lSW876Eil5f5k95nIt3jCL9rREv9aQ1jpIYA8AcpLMOujOzNS8ckG1rINTVYchZ8wXxUvw8LrhcThU8ZrXL6HDM/1yZTyWS3kh6YXzRhMja82BEsNDNwOB86z7loBN6DkLN2ikZ3oHw8Gy1NdxPsAyrGQiFqNfcjXO0UpRwU67iYy1itz/QYkPv79ZO2XoPU2F8= X-MS-TrafficTypeDiagnostic: DB6PR0102MB2663:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BuNbwcTaE4DB1x8r2S2CxLESoG2/M2mmYylZkTz/ylXJ8eR3dQ5oG/Cfb1/IhqXLk13A6Z2F1okBoBfCJcVsXbjVvUmE8OxD8FzTqKOX6QPi4PcyBZ+9/4icgeU9LM/dAW3vY2uHrDN/eG9wMCq/OuPKEcDS81geGtlWyfpi34URH3Rhuc19wcMQmyahtShwHaYSrhDJjU48D5n5tEEKG7kqgyblPoAJ+A8qbMDvNnXj7jxuzL96/HF0uzfGdzTfMiz4xymnI/6Ngku8gkcYei+NF3oqDL1VLGoh9oiBgxInyU6HaD4vST0eAAwsG39XkDauzUzYDBENzhBvt9i0L+cwxcJ/UPKTCG44kruMIVUgCDbAFwzKghgzNk8ttHicrpjaHRNmd6a4PgI7BdEZPfS43X9/2obZvhOqWrPchzpuWPkXBF3+jfdsahpvoeuf37yWdBAJzkyNKbF4oEK8AhiTxZtaWpgn2BXfQ95/o7i0B2CJ4FsWNFRh34Z53jsYQpuWRNn7op8rmJyhgoYdI6QwfFx/Y8YWunGfaBs+guNLZ5rKuwBX0K8Z2pnGhVLIxX6IFdx0SC/VPwiORiHDe9LW8sDjGna9XCfzmB5uQ6f19EcrLtjfcTNWTMPyfjJ1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KMJVRP1LFmiA99nIpAoAiQCrmjFcSdumjpBJZNOEZYQIzcO0WhVtUtxX4peTsyjSmQxXAQfHkuCqYNFzYVwrhtnpC68WJJKLcS/Axua0X7MaLkvw/zG2KBOy2CFPUBWByrfWnftBB/ntbn3I2m/pUWXR/M92PAbYkIDc0KoIFHF/RGxmjGSpMLzYf/zuyUZwuOZl9FwhieBXUd0M5OPFd0UORto6dq2PoSh+L7/18dnx9MWOJCEROJxAFNBAR2Kg2tFTcgUx2w/49sD9SnIkuwmremkaVz6tQv3zsyZ0Bx7I6Fuxy500zgvQQ+YtTH4hP+OBVxchTyN7XiyIpPx4Xvk0mn4N3Vp8Ww4rVghFOuW/srpP4fcjDSlTEO7RLZdtzbWXlonCNodTS7NOXZwGdc/CgYc+feAiV7pU1AmU6h+n1OloltENP41zWwvXWNeXJ71eWqPt6czIgKleckP9giQhxpYyYXQjSQRWXcqpTtJZmEuK0a4/UYPd3DKv43URrJ0neFuPpZkWkNWvcPnOyEY1v1+/zHqQFdyrCuJtCq3juFAeKISnrVB49+pKdWbgC5Lgi2rE2HfB1HRqki5sNAVLI3KHcB7zwcW1R2KT0vzPUZyuA/meez3y3OPWO44Sw6CaH+F/8gU3z+NB8PwN2fFZRwB3j799806TUpTKZdJC2yHxGsnmhsBG2XeE8o660JS31aOYS/XKaEY2ETYmObAqx3ArYRYxli8Tq65wC02ig7Z+TtlKTvjwA/YvDAcx4ww+KBR+2ovTjsnl/T6xHJq0tlOxcshiy7KN9/tB4x61auS9AAlJWv0mGyE1i2WPdrSGBy0KdkyPGHvAQ+pHWnKIR7UjzSK3lWz2XnpDE/a9z2Aa1QhtING1s+WK34wXwuAXdZ8bN1pPX+u61o3XM8R62A0TWeUnhx9QEb4uUpBZCBshhLMBfPmGr/PdL8NNh3IFWuwBLtUKgUtC5hBr/LeCELQe30P56OCiR/nne3uTBuJ6rvz/1nP8LMRV4a0Ex/Uk/8JdTEUmxBE2T1p8HSenCc4u2Eg0XpXseB4vGVEjYsEELng++tQ2Cr5P8bPbOH2lT/tJQDv2ncGRiFAGGMTHfNecfNtDIdMeUacMg1gDjvySr3nkrA5KLRi1pjIpZXeUf4K+SPpY0/A5PlaSHIVvE3X2x6uwIiIGxJT1bNZ1WYmT0gRX+1gi5gsNvW5fHQf2OmhJnmROIKXwzRg/vtJNhfQLs61CwUKoeQLi0qO4/Ccp41ZJL/neiJS5997LCvJ0lGI7KUjYqGOBGTZ35SfQOP2xqlmKVhGPVgwIIQLvpnLuikFHoCoKq2uC5sbndb9jRCbzi6dlV3Zxuw/m3MTSAybt5gH+mAwMMtTzeXT8hX0y/4e9S4nBoquHBluE0YLF7Ko0EqVQ2Y0BDandzP+RQQeqxFj3WO3/JyqA7WN+CmBZ6G99vTIMeD4Jt7xN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32767479-9d5b-47e2-9fba-08da301cd1f3 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:29:17.0186 (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: DB6PR0102MB2663 Subject: [FFmpeg-devel] [PATCH 12/44] avformat/utils: Move avformat_query_codec() to mux_utils.c 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: FsC7zvBQQDPS It is obviously muxer-only. Signed-off-by: Andreas Rheinhardt --- libavformat/mux_utils.c | 18 ++++++++++++++++++ libavformat/utils.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 83c1482540..5930a7911a 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -29,6 +29,24 @@ #include "internal.h" #include "mux.h" +int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, + int std_compliance) +{ + if (ofmt) { + unsigned int codec_tag; + if (ofmt->query_codec) + return ofmt->query_codec(codec_id, std_compliance); + else if (ofmt->codec_tag) + return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag); + else if (codec_id == ofmt->video_codec || + codec_id == ofmt->audio_codec || + codec_id == ofmt->subtitle_codec || + codec_id == ofmt->data_codec) + return 1; + } + return AVERROR_PATCHWELCOME; +} + int ff_format_shift_data(AVFormatContext *s, int64_t read_start, int shift_size) { int ret; diff --git a/libavformat/utils.c b/libavformat/utils.c index 58d2524457..640ce57f82 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1140,24 +1140,6 @@ int ff_find_stream_index(const AVFormatContext *s, int id) return -1; } -int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, - int std_compliance) -{ - if (ofmt) { - unsigned int codec_tag; - if (ofmt->query_codec) - return ofmt->query_codec(codec_id, std_compliance); - else if (ofmt->codec_tag) - return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag); - else if (codec_id == ofmt->video_codec || - codec_id == ofmt->audio_codec || - codec_id == ofmt->subtitle_codec || - codec_id == ofmt->data_codec) - return 1; - } - return AVERROR_PATCHWELCOME; -} - int avformat_network_init(void) { #if CONFIG_NETWORK