From patchwork Thu May 5 12:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1050745pzb; Thu, 5 May 2022 05:47:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjcnD8ULxxN3FqeyuEvHnMaSQMrqiBTTf0jyUmUUZAvaISdZOf7uvdnldUCBGbgeZKW5+p X-Received: by 2002:a05:6402:5205:b0:427:b431:e0ed with SMTP id s5-20020a056402520500b00427b431e0edmr25894681edd.186.1651754822544; Thu, 05 May 2022 05:47:02 -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 ga41-20020a1709070c2900b006f372b0ce85si2543571ejc.680.2022.05.05.05.47.01; Thu, 05 May 2022 05:47:02 -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=OsZExgx2; 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 30AA068B015; Thu, 5 May 2022 15:46:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075021.outbound.protection.outlook.com [40.92.75.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E50F68A318 for ; Thu, 5 May 2022 15:46:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SHE89Nw1Mne3gF2q7xrQbwGwwdFsF2fzivFwHZMjcNv4IrANM5ETs+bl8hdljlB5HCcp/vdRGufrEJuvBVoFdwzICVRarXodE18Di6a7xvZUEarrg5igSC/8xUcjOvhK/L64zG2VLcKr73yZPHdlIvqpNAEzOqARfT6z8sEFE3/UpSNIJzSqmuG6IIejtRCZmqyexQzSh3FFWVz22wk1n3risYMgenGmsllU6tAri4+Hzrt+NXtnQSqft7NIbD4IARXcAzsFopAZbxTBuuDQHSaI17Px4c5s5m9ADIu22dtmrxOLNqkc++ixo5gAr5KD0JlDFkyQMrJ6BX3iLJs6bQ== 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=bakrXho4IhcwB8qc5RfUdgyIkl+DoMd0RZmBkgDYaxM=; b=GDrWwXh8oU8nFfCQXlHVJxbv5FBtkDigelIvX38trW+7bFF25ccdUF7rQ/ze/GLkAiKOpI9tincLuNghNFflrf9tYWYoYSKI+C/8Yl3PmEHAu77n1FmGRokjLXcqboMufsgniI1R4RvxdY0qPqR2+w0crrOZ+mRN23YgjMSMPAl1lu3+n92MKhMBM6D+CNWWXofOOPw4bASUxXuO9nmSNaQ6RKUyupX30Pu+k3ZdbWTSRYcByohC1g27ts0zo0J4FTdKQL0KsY8ItRh62W5tnxyYHJcsdOaQn72yzNI/yX/YZp/ULnUi6kacOuifxM/BwK5EWQNHBmgg855hNiEeGg== 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=bakrXho4IhcwB8qc5RfUdgyIkl+DoMd0RZmBkgDYaxM=; b=OsZExgx2kcpgl/kdxpaKEMVlR6cy+galdXQQ3h6sVo5ANSYd1VGck0Gixd02S38raRLphO6YFNO8TYtUZapMOxJQSzdLL/SK9ojoyEZhfoqJI98knxzqL6Vepv13ebvoNkqveX9fP+aAuNnYT0M/ESz8eneXR65EguSZhuGbT4c9cet5X+V6O0LJPx/HPEqbhCsCGw7ZG2GxW3KP+OFKD6sqxiogx/6Oy5uZP3t4dkDkmnt8ezR8IEYZEp+ZC4khZIwx5Bv8sWfHnL5lXbYANh46xHvvbrpjbbb0CEe0pChh9EO19nRfqRZCBaMAylU+re40TuuutMFJnSQNrFnlTw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AS1PR01MB9012.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4db::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Thu, 5 May 2022 12:46:49 +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; Thu, 5 May 2022 12:46:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 14:46:37 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [N8gsiQrPjH7NOBLZwxgnqLWEMEttgDeO] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220505124637.3940202-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2739533f-700e-4036-e781-08da2e954fa4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWLCY04HziaJ2HKwYoz46ICU4ybg2K82g+EBdatwCHCUevjgKe/HkFFMFc/TqFJJ/v+Uz1mYc6cIUNhHApGyuu8MEJBcuvWBOiE9j4zj3fKIoFhmInEsrIUMUZMERNKzibYtiCtGluxs5gLf6F4TBwtos0UNEZZL3AkXR2tZVIL0/Om6SnJPVG7pyJgGlNzG05fvbbvYoQTNFbWRklqcn3pDFSGS2Xch1PUFPb8Nh1ZClG9hB9EV9x2firWMb4wuRg+zQKLAa6oLppQDfyPKDtJO+7RbGniSc2nope+U+P+WQpWK5hdOC42vfaUwjc4qhxMVhtbavFwOQSNsQX0nzx/9HB83FHGKE/5Fp6ccC4XQfsCOeBqo0q15vxWTbIHAkJTYXNTBrF6JQNFQCZNVRDapK+DRzLkEL8HT/J/IhKMmHubzJpMkVgrKCbzpVKWeFV89g3ohnVcwyDdt56Yod2InRsuGpeAaVbF3QxRR0/lG+rLIFcAH8DYuuWBST9MXbcMsK/7nYPjmd5W3oEkzQXkn4ZWY5Rs7/tLK0ZqAhguCMQVjjW2ZcrBTvWK/xdVddHheYaDnKUQ0nKfnXK6nsO97jNafEYIwpcUKLVDULcq2OLSO3xaWLK5jO1IdC8OHK6KKPzGicmgyeQJuzbZ13UxilPBgt+EkMstOafs/rCFA9GuDIAcSJwCHkkWCVnFotZtR7McwxMo5t0BAeNDEZGS+JFREVQH53c= X-MS-TrafficTypeDiagnostic: AS1PR01MB9012:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 34QW+bDchT3eyBdwisfNuopFYeH+ZOGZhYIVISKD7BmkeItNsA0mQm+t+tUepKsEl/U2ACJ0kMmcY+i/m33yPYnHChvZmJMArbifVLqi9SUsW2wL2NZvrx2xvcqc1cf5I8UdzOedd7VLbo9YJsr6J5AVe59c2koGdcJCwO9xCRr65N38Rs6ncw2NQxG8Y89InimQT6gEypkL3ARSaEW2YvkyjfUP0puf9JrFR+mD5E1nyMnA7wfluxH9h9iqXVLVRSyVaS4ja2ZgmcFovIz95AcpY8PIxVjjMaogQwtLdH9Kma5Gp0icBds0tOtMK0Gzfi90algUDZI0En4giVDF0hyWY2TmAAaddwYklN/FsNCnlGGJj383j3dD+1gxrTQe1jnjR62ssdMygU/IUHxWOyq8usa3wYU3C1uF7MTleQ0grLV06/tl7cO0khRTzVPPmBxrz5M0c6n7fftusGMXfJAvVInBUhh+a7LTO18OJN0Xkv8aof+leYCnX+TcB8pzM/s4205DmlcaMUvYsgVxlli8rtfGL2kGix+rR/2oN3ZdAWs9RUvIofvmZBKsO2kdEBce5GYaigDfOskWmRV8bPLeTFxooFICUD2XBRVXX+4vgrNhIobtL4xYfCdOUb+BQCc9WFsYjQAdiFJZtU4/Cw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dH72g4h2hqRB4GWLCghtqcevgn2D23FeObG5Hu7COjcvJ+U9Tdgymphgj341o95Yn3hLSk1qxZSuzijKhVTUqwKQTVjTuU83lcoT+h5EiZ1I2RdXHNQaIjSLVqy508MvXP3qml6X4alOMNYcPHx5PKKnVBPFw+QFul2of8zpTYghBuYLimMeUeFKuSAHXJH35r/PZC6jDYT/MOSczVBU60fUe2X99h9Tj5el5SusObYmgq9X0+doRFVj/KGx5Gx5gPAvN+AMKhFjyb+B3toyK/RTX9rn7bLq/HrHzHqM7tbmZzOwuew+KijMrfmRvqsDuSr9DcBKnWQAbowByCLIB4aW+Kx6iIJ3U7hfcoi3p4MH0doFjDRmHjggoEmYkNUuYyWqWaUdvT1LYFjwmr0ur32BimrilY47964c6Q7blVcJ0RtU+iMm4D3uno2udLyqHBjQOmcE4GVBCuhbBKXLES3uQT+HlyokkpuL3MNLGGEIQCH2jqD2HyfKftiQFe3OCAWrwcGZPUJ2Xhd174XFN2bejd01XpJBmB4ZibqJq3F0kBBdjgLokMYC8TqOI9lNJvWhuHbzoivJk7Z9RbIpvh0tndsrLOz7fTlDEVxy1FVJtgSpZoNa3xkF9swOdu+ix19o11M+AsXvDOEx2PRJT1+/esASkMJg8BICH6b5osNv/cTwcAb9HeDza0fR/gHTMwwznRzabrZIXylBxqScw38TGj0IbdcTFqzXVNtMUYKO5Vnq4BDRgwZoL/s1vfcEbI1v743qYJZraNYG8WSpuLlf86U2DynGcluG8gKjr5i5f7nJySRrKWUqrK87fKA5KAyLx+P0ecUWwTyYgsEhubzH7zByBTTIL9aPT9nTtU0GcFwuCiMCxVPNr1lQOIpt7rghCG7feV/ASHLJu5CwSll/RY9seMf2b8inaEyc5tzGMjOhrwFHcnizpPkM6PxY4E9SV6hzw/fqsDnzi1jMbuHQyBZ2c39IS65CCYdGOfx01oYCYyJPfY6tT8QlmivC/MONGFMBDYls7tXqK6sUX+OY2I3DzmGYozVx7Frf38dg+P78Vo6y/UzQjjDAJMfzIcLM7PhWMX6mHVFI0dKSFCST9hzMsQM/brwIERtZki59hJQtDloJFklZGixR9gJMVJS1UupBrxQjgbzgS2EIHYDBTPIPX46vZv9IvjO2uQPWQd1R0/HzUNnDEVT/nbysKydNV1Oxvwtf+3EHeyrZe6j5zHu3vlb6tEOV1MwZkFndWWdNmxHH+ceEuviJ0RG1MPDEFspIJSo3GzNfs52fhVcleoKD7eVnxAcA0hTz0OTsb9yetlxcXkxv+AtH1uakDiVuuQ8UT/9Hv6HmK6TrAMGiUcY+L1oUPDT9ofDd29drdvSkbDcSX1xATAW+PeWEi02pOX8Gvmyoq0YHaHVUR0z6LmpaQGMA77ncU98h0QONecyimM2OYq/Vj0OIwUhqUolzOMr0K0RVBifBwaNclQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2739533f-700e-4036-e781-08da2e954fa4 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 12:46:49.1958 (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: AS1PR01MB9012 Subject: [FFmpeg-devel] [PATCH] avformat/avformat: Schedule AVOutputFormat.data_codec for removal 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: jnUTMPuTBXNz No AVOutputFormat has this set. It is not removed immediately despite being private because of the libavdevice<->libavformat situation. The fact that this field is private is also the reason why no FF_API_* define has been added. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 2 ++ libavformat/format.c | 2 -- libavformat/utils.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f12fa7d904..69d1d0fa3d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -614,7 +614,9 @@ typedef struct AVOutputFormat { * @see avdevice_list_devices() for more details. */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); +#if LIBAVFORMAT_VERSION_MAJOR < 60 enum AVCodecID data_codec; /**< default data codec */ +#endif /** * 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/utils.c b/libavformat/utils.c index 3f253c2045..7fbc3a4a18 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1293,8 +1293,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;