From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 21B3143CB5 for ; Fri, 5 Aug 2022 01:46:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70B4C68BA44; Fri, 5 Aug 2022 04:46:05 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2070.outbound.protection.outlook.com [40.92.89.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E23C368B8A8 for ; Fri, 5 Aug 2022 04:45:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=co0ap3DFFFAvyzCsNy86/sIQwrv9EAMIQPOuPZm2ZmjnG9W18UbsNv+Cx6QhQqapCmPahDYXAUEJEWYo+mHuwUEGEgqLelxqa26J0jSt9lyASZD1FQd9hTel87J5vyTK9KDFCZtee6zz2eRLQNZkRTfuPJ3QgzTyFFqoZhMKGmNkbx5Roy765RJJ/sDwrGC+CZzRrvSNF1fQHldU51B3l+msUClpecjSkn5ZbqaUGk5LelhX1Wm+kFW40BHsJFwm/zYj7G8aa9u6tFayKU+kF9uGJLunQ6RHBvDAc6CVxDRmuoHvhA7L7smq/ytGj5di0Y4yDMvuemYLQUnKAf26lQ== 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=+nrU8QMpjsk9j6o/HZTaF72OCPYiSevl581W7ET42kY=; b=f9hmaVAjiGPrsSCX1od9+g3XmpigJPOURYWCvf8zeZK51AqPfEx6xDsiDvmGcO7isE5ZfyyBGkYh+Po8VnEKCKq9ZGWPl+mLfnCUsgsg5Seuj8fsE/tPzYyR6yjjsbkP0mhfsumQIAlmz7LyidLTQCz0ePBXxEi9iiFy0AkQZjKdU5WQXHFPvjkkagdNPTwzKprbiIC+/Uav8YXooCRsqw95iDkr1fQEkTLK9F1Q5AdP4Led6dTEzTW8f4xu1DFc60p/evU9BTb/LdDgMac8hLZ4ZpqSGRetTPeLM+9KDy+dCXG2tIBgJGVINoT2ImnWUQZpa48K+URlH60gu68Tyg== 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=+nrU8QMpjsk9j6o/HZTaF72OCPYiSevl581W7ET42kY=; b=GbNbTQbw630YyxkMfVlQdWM3EgKT4X35LREdhzqbjoum9AYHM2r5HthD2VZqXsSJDoDshkbbfSQ1vtpHCf0ZjeAYtnOVklTs618nlK/rxQnD8UfOK9qirMeVUlxi+Zt6H/h0yIeFNN3IIet1E8sWuLvaNyOvkekopDZn3MOAk8GAIJ/akTGmxF3ssjwntEUkzRQlHJbGNjRV/0pTYgJ9uBiVKU4QxhzfyxXe5HPhFBR7MuD7ZkzvTS98yG+h3XfyBRlboui2zvIfMuBP1bvIOwPQ5WS2QhDCgfBz2UeZ5PnDEqLtrTarkU/TsXmk+Kn5wEfJYAffHSbT3cmA2Ak2zw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0102MB3069.eurprd01.prod.exchangelabs.com (2603:10a6:803:d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.14; Fri, 5 Aug 2022 01:45:58 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.017; Fri, 5 Aug 2022 01:45:57 +0000 Message-ID: Date: Fri, 5 Aug 2022 03:45:52 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [vkoLWCl93r8hXVIDoEgxLZrUGtB6jmt/] X-ClientProxiedBy: ZR0P278CA0091.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::6) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b5e40cf-da6c-40ca-59dd-08da76843b71 X-MS-TrafficTypeDiagnostic: VI1PR0102MB3069:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JNMboO/+yCGbljOEMnNCDVjnoMP0RxgqV0+JHmOTtjm2MvNlBrtgTfGxB51NY1e65BPBxBueE2XlGJAtQJzQkcy3/Of1dSJcTU8eqPg1OZmndORdSkV5heHWWVX0QIPxX7H08aylsD6zi5aLMlxBMsvJOT+seuBunCyHr3j/1vFY30LzNl8K/2J6CTdjw/CqrSNYlzIZte+uObd9LGovlTDrADzBVfweNO17kQjJZleKn5T4wyAp5lEgPG2GJ1VsbJCWvoxmHH42eljpYH6l1LOL21BmIYofSzcPZSCdYKFX3M7/kVv+gtFJLHGt4akUr+00ceWx37Y4FdRX0HU2yeFFNto+RyyBbsaoZNlII0Dncm59V9jx25tI0NhmNO0dkOzH6aJZ3nBtqZHaUvC+0JHoxRdAoPRb0VHCQwBMLemqTUGExP+AN/MNzKEw8Ogh4QOTz8ERQMubVXnWrMdtCU4I2CsGV3DD+o5w+n6ciFQqnAhP8H+XuAjacxmhs0Y70J7ZkO6D8bgyfFd1xrw1UJdih96NU8SoopfA+M1aQVrEV6VmnluSLHUXTLdQ9jbp4+hihbOlNEtDuGJ8isbhNu5n5DTU3wpJdzIHQMKoLCscZwiX+dbTTIdaOAwbdGMBVX0VuloUQjwuH0/pU9Gxzzfo+5ovV51JAUMw4AmMqKu+sQPXpwj+DoA/N7+xr/vp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SHo0dzBKRTd3by9DTno4eUtGemdObGVwS1ZEMGNFb2lQSVVGazhaajV0TkZy?= =?utf-8?B?VEU3eXlscmlXQzVOM041R3A4MUhVejg5cjhaQlZKU05vYTlLcnlvQ2Q2bkZU?= =?utf-8?B?d0JIVWhPaktHN3Vmck45TE5EWU1zaDE3S1EyVms0UjB0QWZ1cmU3dkpVbDNn?= =?utf-8?B?ZWU2RmpSRnIxU29Tck5mZXQweEo3QjM2L3J2bERWcHlMSis3Q2hLZTZudG5a?= =?utf-8?B?a04wWE9MaUpReXVLRTNnTVR2Q3NFL1dtZi9DYnZ1cHBtZ2NKN3RsNUpZRnh5?= =?utf-8?B?T3NEU21nTWVVMlV5Nno0VDMycUR2aGlBKytaNDNzOUwzUk1rc2tVN1VtWVM1?= =?utf-8?B?NWVHVWRNZFoySDFLb0gxSUgxWHU2NVBFMElCZnEyT2tRckZES0dMaEpsUlQv?= =?utf-8?B?dGRRbTJsMnZ5dFVma01lbFVCb1ZhWHZxZGt3QXlzb01HUzRZSEtCRlZTeWxO?= =?utf-8?B?cHQ5SzJFWTNxcTdkN3l0QWhUMmxTQVM4YkljU2ZiNWdwc0JrcG9xbHRwSUdo?= =?utf-8?B?YXFxVDU3Vm45SWVXMFIzd0lSZjB5ejBDdGZHQjY1Nm16WEdJcFB6UUp1NXNz?= =?utf-8?B?ZW5nRlkyc3ROOXk0cHQ2WFQybDJiQXZjK0pOcm96WjQwdm44VFNIWSttTHVu?= =?utf-8?B?VXVKQnBKeGZBQnJoalN5cENkTlJpSndncElYblB5SHpzNkdxNDlzWjFrajZY?= =?utf-8?B?YlZJYzlYbVZtSzRqZXFlSFVKOC9vcWJFYmt1WGx0TGVTMGxQcUhkbHZlcTZh?= =?utf-8?B?NjY2Yms0V2tDODMwaUtGYnB2OTFta0FaL09wbXMyc09nUWxJeitPOFJZMUJJ?= =?utf-8?B?SWpxTmxDRDRMWHFqUXFIZlAxSWhtYjdwdmFBTlZGenBpMHZVUGl2Z3k4dmVX?= =?utf-8?B?eWIxMXNoMWVuMjNTYTlnQ05EcllZU1ZlN216N1N6WUZKbGZJYXp6b015aVQx?= =?utf-8?B?ZnhvM1cyc01YVjZwUUdEQmJWZUVuaWZVMEdkR1kvOFdxQU9Ydzh2bGdvQmEw?= =?utf-8?B?c2ZTTnQ1NUsvbXJTbTVGYm9va1NRODdFSng0T1BrRFpQWURWc3NXZFRTWVY1?= =?utf-8?B?ZjhZQ2NqdVh3QU9MSktxNmhvbEhRZWNySDZmeENYSlZMWWVraXdLaHRvdjZo?= =?utf-8?B?YktBc3dRdUxVOVl2NmRTWFlZRGVadG5CK2RKa3ZKTGJrT3IwUWNVWTFBTTdT?= =?utf-8?B?d2Z0bG1hNGk5VUV3c1ROS1NDNWF3OHZ5Y0h1TVVydHZmcWsyWU02aEJsWU9D?= =?utf-8?B?NDUrYmlKYTkyc3BacmsrN2JkSm0yVUtPTmJtWVJOelVsUjJBd0lwVXE2c2p4?= =?utf-8?B?c01BOWlCdnRhdUVjY2dqbWtQV2M3OVRnbVhVaVhpUWFueEVvK0d2NUU0TGJy?= =?utf-8?B?UjdYcmREQWJBYXBqNXVxNWg0eE5vdnVaK0lEbHF6aDQ0Z1hScGx0UlJsaUlU?= =?utf-8?B?R2pQeU5UU2hjQzR3ODlFaGFVT3JUc0s4UjBKd1kvbWtra1RTNzlOTUhWQXlH?= =?utf-8?B?cFdlVm1BTUtzOS94OCs4Z1FIbGNFQWhzKzM1SGxOZ3BPZlo0NG5GR29SYkcy?= =?utf-8?B?dGVKN294OVluUS9OcjNZR0xhclFOc2xsazFzN2tsN0FoekI4NGt0UUVWS2VF?= =?utf-8?B?dmo3WE13ZUk2cFBjc2VrUEtjWmpvakVvMW5UbG4rSk9XVVVCZm5uQlhBcW03?= =?utf-8?B?TkhlcmxHblkrVlZvZUQ2QVVqUnFXc0lwelR5QXVLeHY3RXI3RmZsYVAyZTMy?= =?utf-8?Q?TNOOE6kaW8Pku0i12c=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b5e40cf-da6c-40ca-59dd-08da76843b71 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 01:45:57.0138 (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: VI1PR0102MB3069 Subject: Re: [FFmpeg-devel] [PATCH 11/11] avcodec/avcodec: Remove AV_CODEC_FLAG2_DROP_FRAME_TIMECODE 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > It has been deprecated in 94d68a41fabb55dd8c7e59b88fe4a28a637d1e5f > and can't be set via AVOptions. The only codecs that use it > (the MPEG-1/2 encoders) have private options for this. > So remove it. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/avcodec.h | 5 ----- > libavcodec/mpeg12enc.c | 1 - > 2 files changed, 6 deletions(-) > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index abd6272f63..1d55cdb07a 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -300,11 +300,6 @@ typedef struct RcOverride{ > */ > #define AV_CODEC_FLAG2_LOCAL_HEADER (1 << 3) > > -/** > - * timecode is in drop frame format. DEPRECATED!!!! > - */ > -#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13) > - > /** > * Input bitstream might be truncated at a packet boundaries > * instead of only at frame boundaries. > diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c > index a7e7aef010..ae2311b39f 100644 > --- a/libavcodec/mpeg12enc.c > +++ b/libavcodec/mpeg12enc.c > @@ -234,7 +234,6 @@ static av_cold int encode_init(AVCodecContext *avctx) > } > } > > - mpeg12->drop_frame_timecode = mpeg12->drop_frame_timecode || !!(avctx->flags2 & AV_CODEC_FLAG2_DROP_FRAME_TIMECODE); > if (mpeg12->drop_frame_timecode) > mpeg12->tc.flags |= AV_TIMECODE_FLAG_DROPFRAME; > if (mpeg12->drop_frame_timecode && mpeg12->frame_rate_index != 4) { Does this one need a version bump? I think so and have therefore not applied it with the rest of this series. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".