From patchwork Mon Aug 1 12:23:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2470388pzb; Mon, 1 Aug 2022 05:25:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR6EFq4aMibm/s3kH9UpHVQEcVPRVWVMpahsyvHmLn4seezRV0kL4HdvJxLnyLuTNyrqjUwZ X-Received: by 2002:aa7:df88:0:b0:43d:3ac0:a33a with SMTP id b8-20020aa7df88000000b0043d3ac0a33amr12254727edy.157.1659356734208; Mon, 01 Aug 2022 05:25:34 -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 t25-20020a50d719000000b0043beaa7f1b3si10842031edi.247.2022.08.01.05.25.33; Mon, 01 Aug 2022 05:25:34 -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=gIpRqkob; 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 2AE0068BAA2; Mon, 1 Aug 2022 15:24:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073042.outbound.protection.outlook.com [40.92.73.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0932E68BA94 for ; Mon, 1 Aug 2022 15:24:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZjRENxUF9MxkU+x0j+qby2YqHmVaHHkZkeNXw//fHnmNkUFLZgmMD0rxjG0t8JN1iGbQD0TBfQ8gzQkpl65z02JlxhsYdOmBL+Tv6DUnAprGD9BPJzL2eKyHkrMGh979aWZ6Dv4ruzVz4ZDqyj88di+D972ollygy51DBaTY7v385r2viNscpxPkLG01CX59P/OYzi+/PLfgDtWUIn64yjEq+LYD/HYrK+X4i1sotV68eVSALaA/gP3FZNzlElwArKgtLjfiXiNfkfP+8xvYPlXYl3MEpepric68hdhjFlb4d/RxylxooI8cRe3g/cbhHjirom3hnZCrVBoAorxPbA== 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=+MSXfHUDtQnJb/ckh9e9j4g0Cuu5N7JKzuYnHD7e3uQ=; b=nTQmNoPTTKffhnJtVeYp0Py2ScbFRD59Wr1aoLHfckj1shhbrZaDF1n8RzIauXsEyZrTNyV2K7baG0/4LKQhfpvgeEJo/5AkiH2ZYq5rmkN+rsYS3S5ydNGLpmHd8gfe5pD5bVy0lmDC0v5Qa5KfuI2rNhe7vMVJAhfdTtUuiKcPQngayCvjfnN3dlr6o85KJisKZOfjiN8B20naVRlEhrSezjcR2Kr9u2eF4VQEqHt77/4ULQKyKqqImc0SgwODYuoXAY9xhM8jp0vXwhZK6YPTP7wCRnLUQQn5wJzVw1jtad4qKcSm6bXfhhwUvsER4Lp1pmF8O1Sz4WsUpmRtZA== 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=+MSXfHUDtQnJb/ckh9e9j4g0Cuu5N7JKzuYnHD7e3uQ=; b=gIpRqkoboz+cdNy5X/yq+NxBfZEtHMO/vy6yScSEEwzTf78wXBgFV0TFY+yjNIj1BolHvNmRT+PhHtQkgg1cdOYIE2cfND0FXhZdLWf5KZUPV3UTybgaMQufvQIOtaupOmmi7c/IwLrnY3wgMpppprfmu49pLml/6VnsIfSOPx4BsN9vb4T2tzmyOPtGBrd05VjWOme0JBQsBcPnd07M0RKzGIQSvn62R4/fk2Mxb6fRu0QRZwq22t/T9GjMVm8pN8m+UTNTRI+xYDFWGwtSN96FsbMNdRWux3Mh/5tofnwTR40XTq3iVWsdOWO3V6M3IKRnlSh7flCkQz8vJVkOEA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by GV1PR01MB8529.eurprd01.prod.exchangelabs.com (2603:10a6:150:24::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.10; Mon, 1 Aug 2022 12:24:19 +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.016; Mon, 1 Aug 2022 12:24:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Aug 2022 14:23:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [F3GiQT5Ndr+I99SIKfJQGyHKD79Hqrer] X-ClientProxiedBy: FR0P281CA0137.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220801122349.3996066-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6d78c03-958f-4ab7-0297-08da73b8c1c4 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtaDav5KDaKmGsTLfEoik1v/E1M06Y9/RfMlvYyBcUIRnfRDunULTYOGcWeLvvZNKHF2KafjpVhN49SOuMH+RP9J6QsxyC9WNlsI27YQ6OAEkutRe3iTf4nQc5yay8onv3iUKo0ZhEM3ZyrNzaEtXUPm3J436J5wXwBI57S8cJR5LbdDHFWnNIDhgt1xJ6xQ4gR2JLSLqPz969ps0aUkv8Cuak86R5rceH0RVLQs5rKni+Yo9yeo+apDqYm8a4dDXMxZ38Rm6kpSM0J3R3EUwIFALUUwNUM6hYcdmBuEu81wsgeaXa92j501CeHBDs7xrcOkhCwseiOmgSbzoMs83DRtcqj72AJUKMDxUuWjpSMiUA/ZLdtEkV78pMqWjdG4FLE06vLTkfuBy6wMUPoN/xszCAZ3TJqjP1sRh595tIcpmgOOScQ9fqcILjoyMFdLZit5MLzDTvfQCjSxLX6LD5reWSUcS23LbXZUnSbgSfwFVHW6kEAS2NCQCWJYrClqBcgBsJ8u8mKfTHgskzgOLBIylYrcCYq7HhZTnTBhL12CW3ZxYmjA843sBY8Mgo2sE+z8oxeVr12dxi/dbJZ+xyoUos59CHcO/mrtTOv0tVgglELeV/sWmawomRb6bJcFqjZ1nqg+Ec5YKawoTtgzM/udfP8U2weUaad7GJsZYl5S+RqHQh4QgxtfgV2qYJ9/5pMLyRpOeYuvLBbzxTl2Plkrt8D7+zUn31r5RRmxnCXZWrVYIuEaYJvIGcAyhaOSIQPa9FRqAIXEju1Kkf2G6hx X-MS-TrafficTypeDiagnostic: GV1PR01MB8529:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YmzER9aWtwk0yespnHi7QCldRUAOayYP1gdy11BFmKjFI9aLuABP+sw8hd+lzo7Hlzi16whX3ZAd0vt1NhApPLJvY2Y3YZ4A/fc76sImi9TaPnS4UCBg6Qvk43nwax7Jc5io5Po4i2BrUp5NhIZ3Cq/GA0FZm4p5edxbmYgVzzKpBwOA8htRmeNoe/tcSzlj/toshZDsybZehUhqGBzSIqhwZ5BAMxi5Jc3qutHIYpzmKM/3drh4Er+wkFY3FTyoYG0Ax7WqsCq3p8BzN/Kjroqoi7xu7DBP0IoDvfwlhsCI2pRPlHBsNPhyTwPUCkiUK3hBh9p6eAHN4JHwBrrUM/R4XKG9/VxPYCujTCeGpGriTNu5Y22m7mQcIa/Xz2npMmzuNTQ418xUyOAT/HpHdBXnOz8p93PCWGyK9x+lhHaZsL/nV0yDOIBp1ufAYylwj8Fp9rYqXtqSxOXBLT4a8A2zHADLR9SS66YjuLarodJ5YZZi0iTZpcaP7+LfOtg/y8G2sr0aEauEPJKCGYmMQOKnNZtjZVc/mAjbLddYLxY5lWrfhCLATt7b7QBw5ToDyhuCKUj1f5iGdDqLHvTyli0ejXarghPgBxDKzspgQXMObc1Rd3/wSyzqqh04znUdVjfUYyOh6IrB5+0Bdk01aw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tUErPEQkTINxiqVq/DVhUc0mXHd82yHaCaX6/vO3M8j92NcanLAkzHyRoKLYSxaXQbFVzdLIZmJcbnjFYRr1MdYBaQ7N2aENg0amer8ar5heJEoFQjwKQ6fuIg5ATooV1q4fikKnpxDoW1e6cwTS4/5czWK2GZqZH8r1UXtifbQ7EFgTisHkNQ9gYwnTpsG7FyKOk1DC0ukKLTPB4gRQ9C3lWAT6gSdWSTQcosOLI+Nq4EgzS88R1uadp6ruZ6lZOznrteHNKPPCXkKCrup3a/2wDXka/HoXn0t+VOft9/OSLGAoaNrj11F2P8p4vpDblQwbC8NTjzzSAjgp7BdmpBKlXrYlIgCxEuvdrQ7FR6z1KECkS89MC3+1Y9+u62h9B+8XtzIjNkIGenNKu9DCYC0SJWnSmFOhyCQ5mDt5lMgCQ34/EAQg5AL0FmkQNNaQ7lOSCz2p4vJ/0gMTOUB3kG7Z8CPHUiIvZ7GsM03xcnx74uocRlYDIb5V/U3/bPxDgK5J40g275nEDGII27s8ww0Y7NOnuNjpsxu1mgOFWNAYPaqzKVUxOzU5RZJGzucNaCDEyJjuGQrsKghbB34mJ0G94aq5NamhicLiREor2uKAj/OQGXDeezKNer3QqoSIDdFBK8avzFMs7T+56v4rYudCSJ/qpzARoBONXqwwzHDi+tT9mXrgF/duinck62DWq3DN0XdZRX2fSfnnJ+Q8wr3dxJ33TfIA7DFEyNqG09FODsh318L1zfOs2R2nf3+69u8uRxDxxtfs1QpF9PIFe9mFo9v4A5RSPTM78i62hBPDmnpNvH+jZOp51XNb0dOQUGnd1jGRVnmp2usZd2oznsZvlB9YnRVyQFf903+JFVvgaxjprJlXlAgT4f1CGULlav27YXV5H1umoMedLO1a454NH0SXvXIwLv++qvyfPID57UcEpfO9AMOkGpSHc+uV9djGRnSIy5xxshAd3JxqbTcToLbChNsXtaRyWt6m8NJQD8Roo+APtA98sE3lB2JTNnZsBlpUKaBfbjvxvdQ1YRcAq2hO93tB2HuVr2Ospkd24euuFf4NTDVb9MAFStgoduu19op1fCVqUl8iSudR8x/W6vwOlIg/bPOxUh/AJiMuo/OO23yyjnc5VDdrMebKLoK0lU6gTUcDmrEqzLaCOVH+VlE4kNBvOXtHjVEoPaq+JkFUhoAQW+jsw00/S3bR8BQ8FMI9qrR2s6UaM+wfTYGxT9Io1mlMFX9VVYhORmhYJsE4a4K/pXUsuy7oPGFwkJw3vD3DBLODLH4dQPcAj0e5TWnc5W6AlkRomm/ya/E= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6d78c03-958f-4ab7-0297-08da73b8c1c4 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2022 12:24:19.1027 (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: GV1PR01MB8529 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xryzu9tWFqEa 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) {