From patchwork Fri Jan 27 14:05:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp1372271pzj; Fri, 27 Jan 2023 06:05:56 -0800 (PST) X-Google-Smtp-Source: AK7set983XXkeY+4SckHRmEBX9xHWjXrRYo+wLxt+yKd98Eqn91p4Z7I57+wNgRoJPrLCmxkrmI2 X-Received: by 2002:a17:906:9bd9:b0:87b:da77:eec2 with SMTP id de25-20020a1709069bd900b0087bda77eec2mr1509823ejc.19.1674828355965; Fri, 27 Jan 2023 06:05:55 -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 fg1-20020a1709069c4100b008777ffc6481si4376124ejc.110.2023.01.27.06.05.55; Fri, 27 Jan 2023 06:05:55 -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="gDD/ulOC"; 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 D77D568BDBC; Fri, 27 Jan 2023 16:05:51 +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-db5eur01olkn2028.outbound.protection.outlook.com [40.92.64.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 653AA6801F2 for ; Fri, 27 Jan 2023 16:05:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iMrmTV/darIFz5hSy/hH6RZd540MVQyVbElqj/r7Oth+9T/Wu/znZCF2uJdaM6gxpRoI/uIuVUuHc9f3k301XfVBAciKVvbvW0JjeLmPLzBH4YVk5WYZh3F3V8dYIynWrA8IBthxkbxfIBUOq/i3/TdavJeTzIg+PxLRtpJdASgtWiyef6Lm6tNgjl0oHYNF26Lie8OI4baKNjsX1LU0FrlGhOz5oeVViwH9F0XaqficRltCSA9nJTIblFa+/UHhqkchSS2u6HJOF6qPfCwiORsXcfT15L4tbgWCnKt114TaLc9+QzcztTEUYKrUwEU/H2sFwbYdcAwS3OKXGSvyjA== 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=sRoJ3PmFLOsbKlM5x5gJRAstkOkuh7bAFAKyR+n3mWE=; b=ToDHn4xFRFNsX+X+0lsCKAmBknCuDjOpB3BMJkqe4hYNb1nHQcu4ig9Rt+Vf4w08vm4KcpHWvMzOH6lIqSXf10tAsXmNlJ/dlvtf29v5sx/WfkveCuQ2PVSjXlRQAZt8ZgwO8MGqw0Hsyy6yhBXZgpXoQHMVIONmzrZFodUS/DF6qvvEdnRxYGW+u9KaRCRbXzC4gQCTtiG/JhqYCqGhoD8R5gfUU4wl5u91J/BF9MdavRN7AozLpzLPaVIpN/fBgLfdxWbENOo0GFAf8TUrfx62UN5RrSSQ51fLLGvn5aPq7gsjIYzZ0/9KwOv6YO9oXoOmSlXJnLJjixuILiI+nQ== 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=sRoJ3PmFLOsbKlM5x5gJRAstkOkuh7bAFAKyR+n3mWE=; b=gDD/ulOClAhBNfBHmQbIAfsGK6J+APLHsKVSmZTtih5SRAHiwZeSYrYBw4jINTu/OlyjQAluSkoGhyaj80aAk9XQBxpFQblUV/Rx1UCwdcm49R3hXMME7buNPIBeRyiM6BRyto9UxjbUHqRLgopuMUfjKeMIUfZhylcSeCe8Ae0sdVKYfPu8zXR9Fg688nhsYgaPDHtu6pTWqZpyqFIQ7v80aqMkr3KuiEY5oJBfS8SJf/GTbPyiRTev7eUurCZckSUGZtTZSeNSgtPDCo4eECgIWVbxuJ1gH5oDIV1fogV81BRUXYsznGINuMe+gM/AYqShz06miyqhNS0WDSfgow== 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:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jan 2023 15:05:55 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> X-TMN: [3kDlMfJkQpJf7SakSUJ38AKEgMlNQtf7] 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-1-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: a5026c57-2c26-4361-88af-08db006f9346 X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwUS9vFQr7jTras6Amm+l3vpKkZNcHtAk+R3t44q2ovl86g9nG/gaOcbrf/QxyE6sDPJtlCXT0Gzhk6Jewknhkld83vy1eb1pPgOi0xyrSoRqB3r+HVJH6eH3PiLoiQ33YNThCL23dOy8l6TTC7FRH9nWUW/+ESe9hFV6dvegf6ENTGLqiHDBKyrF+b89g35iXFm2wTmHLNFgO8D+/JuVlOmpORyXsZyP3WWX0aq4+cWyQPrpY5yTJQ1d2JXfpJN3j+6eoJJnthSZYJgcjtmwk6Ikgn25z6W36sar+y/Kcm/4ZvBPET4QuuJwubkhkFM4Fy/9zPKtLaCtYA4k3fd93LUcVt537XRMiUikkBu5g1UDcbM774fnGPK3dKlHonRp/gpVSQriAbHesVQ2nTvIkP82+S0xSu2wCo8g+afb7Zu/wxHKAkwb99OtEdk+c/iA9/TvfeaO8GIaeL3nUKPsAoI/D3vCufS9LEnZrf70rzGtBh1QaLfoLz8JkRZzuEL9LK/0EQPgZZ/SIsQQu4qkLJwhGxb/1vMg29BojE8wQl60KahTmpkdz7F440qHoNVByZ+EGfUZguy6cBntXeVGS4A95tb6qNzinHcH06cBLyhcuxOySx34PBjWv2VGLNz6ClYnTVvRk+/wPVYD1Vgwrde3yUqbtGyrVAsltGWE0KuvDASNaX2HljIW1vt2mt3OYwv1Ngd+fH7RqUpCVqqaAJuh1q39owAZXcziU6NyEG0iPNFyYrYV9UIA/lkF43bV+E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E7Q1/5ujnvapHgIm60cUyTtcBbprAkOLMRQxNAeRFXKqam8zZNMIlF1TtCoN80nXMve1GwMYR+XIjy7XfcVS0YAVtPsWnWustaDAJqZzR9ZnLRRHur37PrHYTDWz8YMpAdDXXogF1nnBgNuOGb3LoA77JTbRdECtFWMyV0+/cNo7qfPj728Izp+mSTJeDpBYSPgF6h2X7hmOzXDjZA3B4LI1yKp1g9+yCw9KqyuyWuYdzvbwq5pnatx9CEXlXncQPANK11Nwaou1E/99LCDDZuGpFqpjFIdg7SZ5QmaBKtXLRrddapJBVtpun3HAQ2O5Z/nW8rCeGHy9JNZHAnPk+BwDQAofXzzFvxTij7V+lcQEdkZRSVwFMcGGEwImiXEG60k7cs2GBNy50N425/SgmlyitdUJGeowyn0AsiS+WIxUkihWfr1gsaI60b7tVRMWhy361k3AcIoaFObxd12Tn5gVsUkGrGlv33pGdgPXJ83sxQBXBom0WWRX18hfj+Kr8ZcgQHwFbs50ztDfHxopO7OSTSaNDUF31ogy05TqqRZcRCyHQCknlKn5PpsyVQZ/UwoxUhB6VJmPmEiW1wUE0oAPtD8HuuEHuQ33NjYzZ61I1G0ccAZAGkULUvDdDEsyMWCAWevvscE4uOMYzJOEpavo6Z8wsWF+uyNXXR4sf9Q= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n+zotaF4XnKrqk+MUc4mXcBMRUSnQ94/3CVyRDwYs2I8hbQmbKmw9rkMDZ1K6Fp0OHUjoggs6GGBYf32R0d/fz4sBq+mSJUeYK8Pdp7qYUStfF8J3lrlhhIeUZtzI6hGNr6eqYwx6qKPSPRtf8wThZS+s5mcsqXalkuYBwMK4uIa/BAHcQtBucKdq4DdfwENVXdao8kyHBYksMIUvyWgDcAMXw4gXYhS9bqcHnymgwK2jqcRkYCX3apWK5eo4ZQuW13slvKllxz+XqEueGXvkAaOGw31lkbgesc0+enYSIXdpZN+B7AwaPsS5HVt8A2E8GTG+sUrp4RBY0dnA7qe33jXftubeUU+p+90qvRWNsKeGPSHkqzmVgnInzYikF7xMwzIbzEcq2U3KOISBhHvFcoRjkNDNQR+DUdl/cm04o0jfNQfKjhv7rnt2Fbd0DVegLrcmx86TwvbGwPwdzezbeuzgxdhA/E2GoIOkX9xAFaxugrmc4ch6I0pokEIUUczuCbXG76oG4caFF/S4Cgx7ThWl7PGwEbU+/V/1yT/R8anwl0CxkultIndsAQxk+d1n3uoo4DWVjcZ55vS7vX+/T8QdHD+fSr0Cg74dChpw9/N4d9niwJMAtWLVoiFf9F98ploqRT36GZZCwIaOZyNXifsGPRhjwnH0xpn/nV/I0s3FWj3FAQ8QR9Lk65penzO+qbdfajXqkir+h6j/poTwgBD3atOAegM45x4sREGdhiv/gm9tXlpcGAaofozg12sVbHoXH1ipvOFD7S3q02Tm1BuGimo4LBi9aSU45yAsnp/KLxtsHc35mHabLd/ajAp2yxildOiJ99Si0pEEWbW4eUpIW+vR5cQsi8BW5I21FTNH5LYfA/iOX9XIe+U6AApbMYTUqoh6J+1AB9wLjSFZm6TXl0jeZat43EQnlQCIlcORWV7b0+yQ7V9PCKeuWjZ+rDofbzlDcNJdXb0PtEpvAtovKjxMU2gFra28mTkUCTmagL3kXwgKiGPiuXICwwMyfFscfAF/xY96QCy0HjqFduFbr9wHvfsh7tKcO1edRlbQGQwDxrfZJPpbQugZYHyWQP6PytSr2PlykM//kb2kctpMx7kFj9VEr/drcx1Y4Q+1nE6hM75Sf73U5X01dTZUUlHUvkemazTieTVZDmdmv914b1obPXVgTbPSNJR2vhLFGaUUlvygAFAY1HApMbF60KBSiTSdm2D69LylHq0BgN1EQzrW5zKUUJx/GAnKxUfdjQDAm2GQ/rvMQRJ6A9m0rr/ElHFdlKB8nac6maidDbp71GZpeVD8G1Rrbu6uXg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5026c57-2c26-4361-88af-08db006f9346 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:41.9518 (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 26/31] 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: QdSH13gcedkK 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 e2582f2484..4a9f9957d2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -301,11 +301,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 a6663a158b..b93e5ca767 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -249,7 +249,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) {