From patchwork Fri Jan 27 14:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp1372403pzj; Fri, 27 Jan 2023 06:06:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXtjJMNZ9g/2wdp+nuYIgkwR6KUI4kiEnD+Q1+4i96CutLcyAVj2InET1b4YWXo2e1M8aGvk X-Received: by 2002:a05:6402:28ca:b0:49c:96f9:417e with SMTP id ef10-20020a05640228ca00b0049c96f9417emr40301278edb.2.1674828366327; Fri, 27 Jan 2023 06:06:06 -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 cf1-20020a0564020b8100b0049e1913b734si4985722edb.200.2023.01.27.06.06.06; Fri, 27 Jan 2023 06:06:06 -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=WpGcsHf4; 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 EF68968BE11; Fri, 27 Jan 2023 16:06:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2030.outbound.protection.outlook.com [40.92.64.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A827068BDEC for ; Fri, 27 Jan 2023 16:05:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=caDLmWPG/T+JMYlxlLiFPVaobGnF3owSqpo/f/pNIciaEOBXZMXck3AfmNmjAFvnuz9Extr8nZqzDX7Ht6xzek/X8BMpauEAKxpgrdcFRMBmk//E1o/NWCBy7kBJ5DC74i3OPGAvPFnScenCz2xaHAapbA/6H+dh9cwen9lRieDQ3tOk0jHtock1LOMFLGLjO9r2WOsQ6EHox4b59ABwER1Pmr+MNRC14brpp68fxfiqbuONG6OUNo1/nbFIVz7ZoyxwhO/e8HVSziYtsLFsDulZjbZXq0tCZ6RXJV5CFcqo7rUbyvdnCcVZGd6g8VMbCrEgXx6BxrDW6LEMTh3KNw== 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=Mx7BSq+D3NvQpVnbwzL48eUZcWVoWk2kvEOWNWbj2q0=; b=kQVFhhrJdTCEDvCahS+Z+8pFO6FnXiltcGzWNP+6FX0RdRZj7WzLn/03do6foVWZBoaTMpc73xwLdCaR0Ph4Od32YhrM/pa/AoVlT56EpdkdBkJpb24e7vGVfYlKx5ttqH3LFU/ThUb2YvHAG4JY47DQ/jV065EuUHSNw3C1WnaCVJmfBRmxOPEu9TVqcm9akwj/kIX/kpBTo7hXiixSsEAxkiJK3sqlDXSLUo1x/nAkV2qsw4uhs/rhXxFE42zm230p9yxCvVZ7MygIq0D7h6FjmXtXrY77qN5ytBk2+1RX8IescLNpuD3yDkv/47Rw8yNVumuWWoX2oEkCOnMlqg== 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=Mx7BSq+D3NvQpVnbwzL48eUZcWVoWk2kvEOWNWbj2q0=; b=WpGcsHf4NaI3vHIp+uIrf7DCX69tzeXMXncvNNj6ozV+zjRDfu4VnCq2aMqcSeXdcGg9HIGhdZWNpCoYceNhuCZo/VQRHWwaIvvo0MwaVHOnLMXwpfWkqnWx/t0BIFXYvQhjmR4KmeC3mQN7glKdri/GmXJUvAf20HZOt+MR2Wofd/BUfpsu1nWhSxZ1l+Zh73WJE6VaNAsVlqFMoVxglCdZ9VJKK6Xm/JI2fmic7JMXHU8Fyo5JycZydDVG3EWa4HFIj3cb94PZS7ccb89rX5kZxCoxPjR55tCevBPyeBsEEfW3P8eVUpVkUzJXDuXHtUFoiomW9eXc54bw5xve8w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0741.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:539::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Fri, 27 Jan 2023 14:05:52 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::a65f:2ae7:256a:ab96]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::a65f:2ae7:256a:ab96%7]) with mapi id 15.20.6002.033; Fri, 27 Jan 2023 14:05:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jan 2023 15:05:56 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127140600.2831578-1-andreas.rheinhardt@outlook.com> References: <20230116133840.512-1-jamrial@gmail.com> <20230127140600.2831578-1-andreas.rheinhardt@outlook.com> X-TMN: [6keofKi82D2MC7JJjXzmJ14jkYFBFjKz] X-ClientProxiedBy: ZR0P278CA0164.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230127140600.2831578-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0741:EE_ X-MS-Office365-Filtering-Correlation-Id: 25706b51-9ec4-4f7b-c7a2-08db006f9974 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxBE74dQ6G20tHfBHFjrBl3nt2VNKf5WMVd9q/rgV5DF/Iqj5zWeWD973jnxS1tFLtszSpyQDjebfZuehpxXV0HZOkQCtzyQiH5NFBQUzXbukYe+Hmqr6UMFwDb3cWKi5ytHyVqU9ho1W5iaKIt/DrnNAYg8YnCiJCSP+CIjzZzhH5Lr4QaeuxOE2Nvnupjtjhfc3Vy9mqmTK7WBPCvSnjxu4Kn9FkP4sYqf2IUMspRtJekNzWbdp/3vx7htSul1grQjYJV6bdlQmW+hMxdJSOs1ABxMx4pcrVhMxr+/Ds8ruDMC7wR1co5bOosFkA0zzb9S99vePHPiTil/lxZDHBgk7NfRQcXJ8XTvVCSMMVswSp5qX6jvq5igoV4G5OJJOLlI6AI7saURF/B1nBHEY1ZeCgYJm2gGJ2SqKR3ZY/0SmbZf5X2giyKZTo5ehqOMQUsGUoSaWyYWY55XWzVJ2aUdQGUYqzZIKtNMqpF6UuDChdqhpRPL6o/Mftrl3YtU8MbFUdWv1aLqiyWwF29xXZtN11C5wPMQ5CXdXqhu/SzTVXDvp/9BosUdK3WhOqjyF+0uQ7RcDMuQKR+nBWYfUBKifXhU4Qx18H843duptBN0UJwrEumsCAXe9xj/4lg2NpUaLNsYxoZ5tqYB7kX0qMH8KLYON/A7F+leUbEZp+9/5qBU6H+bx7jC/FUURAACgZs/7YsN+VF3I3JlktkK0RCNRfLFfD1u38= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: taRMPBX3/weSK/ampzR00b2njyYdS+cuu5fwLrnHKJS6bEigoHh9YCZDsUkf9ALxzDLNHC7iFn2pMa/naGYTzhPaJisYOFalsSyzIE/nC0hE1aG/OmHCTfntP8f/2T1tBl+GsfxS7npYvUXxuzeNR1EIZSm6i9JST27a1SiiyJhTOP7G6XXT1xe4csioaSDw9nefMhb2mmfeHKzct1bF4tInn7jR9Z1X22DZguj6m2TC+mwbU6Et0LRwEMw522NAbqGCJ4eWeeOPNgFCZ/M/ArgrJv5noaY6tzvmcSckoq0Mrp+g7FHW5G9v87uTRVMYWsEZf6LSsTpDdsry4AUqKj0qp9YdwglHbhxDtSwASNerjNBMvqF7rDZGCNfUeZ6VsZhKB2LrtU3CKd6gvfcixdzoTBNySYq9NbhXHISDEoUOq82S2kjqtqgr5KVpnffcUSFq83vhDIPn882+8lwIma5+6qR56T7Q+8UOqkjsU5ajEGAiQrbVZIjSgJTEfFaHz7ii0l3oBJliavcifuepZjJ5EmkSAyK4Vq/zdtJlWxhJLLbp4dsFsTR+BQPSNp75u/ympdbEzy0HU2GV6zuQmTloaPDi0iyJx17YL7iSEZzb8PpMda1bxMOOj+Bw3PF/NxqjGf3hd0KPVM6NpHGq6vnGp+59hXhlkGZ1amOroOk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ih78hvLiJ8p/fU3muHCA68+aay4gTiyE1lgJL0qMUUI2429j/U4K3BgmFvsMN+5lNlcXsPNOMKRE6A/A8I0P+XCJNf4fNWHBIOZq3eb6RJr0a56xmHgwL/B2v2igL/tu1IYc3lnvavzv9vuIQFr38HGUVyZ2k76CXZzsHWv9TMB2NIlDVWOrJgViyAe8l/rWl7LTgO7bc4G4+97/0FYOCcfaLVYFtmdZWh930kZ5NrBAjJVAL869xyW3QtQRUf+6gOIrvGuhaAlEkTS3N8piGWzoCkrZt4lwWirZ7Imr728fqQsxrW6L5TdxQaHgwJhVoEQjf9PX7iJnWzARh/ha/GjhdHdUvowHC1MR/BBgacfqXAxiSCEyxHCPDi53P0O4PkRKy+JkTL0RmHYFCF45cECysuYVlgc2Ptf0YF352E1pO15xYozZHHfGG9uQJjgwSMbcNoy/0b3DgQcCPiDfzQpxi54OOlZDeLGnpiv3g9QmMtXzw9xbGJvteBllTjiOzM0sJCGM52Lb4BeM6P/ARn3mmlSszBd0CfJVk9MMouAE31RPidBU+LeVgrOm32GbLiaUw0FPEQ4LpyBMNNj+3RGIxuzrGYnpwXrfRCsB9Rn9sFbTQX3vddV1WeJdRFuNwEno4TvfMmMnqILEFqkDz4/mNANf2lPTb385DFx/jR9Cb9Z5S3rgXiHy3fKru5rczG6QJEEei1xjWyIdScEbks3TsaU0YZw/6wDSsA1mdKHA9rXRkbgBwzxdMBGUJV2Avn4FSDMrKB0PSvlYv4tqlp+qqEREZep5a3FbsWL3vscuNSSO3GyJNrrSpOV1dthYkHoLwO3tvTiFL8blIM/2s+RRMdtRPldzQKy6xy3IaHLVZuO0d/L8k4813GYMmaACISkah0g9l9Ci0mB7b6xP4EPYAMpN1MQPcPf3NO21igOI1cRa1MqcAbica5TIwcR4RFqijrBTIwo0+0NrM8PPDdz2IJF0bEh5RuxNlU1k9hiHm1rkmKtacOB32D1V6Hl49WW/EsaoZDJtbgC8c4iV354IpW9ndydFiGYBd8h+P4tkagVcrX9ABODEMJOTx5VRUPCnNlXWvQB+re8x42j3Puva0r7LwKF8GM6FbpePtq0UIPy+LnhHoZZAkBKeWY4XhKqZyDS4F66su13a+ZPGv3mu2IHxDDJKroOSG21+5J4Q4cT8kpKrwPfPyt6uCHMZfLtIXfciLzrJckHRmU0GxWe9J10wjgCgoCf9T0lefmGeYAGkCwdzTq7DAxr1rqXXZtuoD7nTogjSQfHQFNJhMqUDFQUuFX7Bjy0SUxV4Wl0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25706b51-9ec4-4f7b-c7a2-08db006f9974 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 14:05:52.1806 (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: AS8P250MB0741 Subject: [FFmpeg-devel] [PATCH 27/31] avformat/avformat: Remove AVOutputFormat.data_codec 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: YrmDNAkc0YEI No AVOutputFormat has this set. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 1 - libavformat/format.c | 2 -- libavformat/mux_utils.c | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index daa396e5a2..020906c94d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -614,7 +614,6 @@ typedef struct AVOutputFormat { * @see avdevice_list_devices() for more details. */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); - enum AVCodecID data_codec; /**< default data codec */ /** * Initialize format. May allocate data here, and set any AVFormatContext or * AVStream parameters that need to be set before packets are sent. diff --git a/libavformat/format.c b/libavformat/format.c index 4b1f3c2986..76f25ab5a6 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -111,8 +111,6 @@ enum AVCodecID av_guess_codec(const AVOutputFormat *fmt, const char *short_name, return fmt->audio_codec; else if (type == AVMEDIA_TYPE_SUBTITLE) return fmt->subtitle_codec; - else if (type == AVMEDIA_TYPE_DATA) - return fmt->data_codec; else return AV_CODEC_ID_NONE; } diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 764c834fa2..55e58ae9d6 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -51,8 +51,7 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, 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) + codec_id == ofmt->subtitle_codec) return 1; } return AVERROR_PATCHWELCOME;