From patchwork Sat Feb 4 10:41:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40277 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1871513pzk; Sat, 4 Feb 2023 02:50:21 -0800 (PST) X-Google-Smtp-Source: AK7set/XaOu1XNlp/F0gpPj6gRM2Bb4lCoimEvVxb5RQr1wmgWOKc4cf2WJifrPaUf93aCYLR4/D X-Received: by 2002:a17:907:3e82:b0:860:c12c:14f9 with SMTP id hs2-20020a1709073e8200b00860c12c14f9mr17109229ejc.40.1675507821370; Sat, 04 Feb 2023 02:50:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507821; cv=none; d=google.com; s=arc-20160816; b=ngZBrO7bNloYFbhhbim/SsrZg8/rebCERXEYqvedrXvNlhepaXtOUA+hX/YKP6YdjD 5PoQs7bDmBF2f6PpO/2jw6ej88C0mDYaGmg7rvRHRPDDNIeRtA6Pf6+ZBPP3TdfoeX1x JA53cmKcwsIYdgBbXQ61tW+oTJh4DAfTcQa5ZFBt+xATqJxid8grMCH/aP01ZnQC8htM 214SjrzdsrR/4nQJF/wSWsrEVxGZiScil6VoFt/1TP7mcbSK89EoqhN7SJxNY+t/o/6K 1/3qUq5zE69e/Pa4Ha4kcCcSmYl7OW6BDB+FtpY4s/AAzxKC35cCgmq9HxB09bqkgodZ HVEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=i0dYUHRB0i1u7AxjCPRjNaYNaAljFXShZlUsUXJWhVg=; b=GMUlkHVP37ZoKePf148LY8zHe+XDaSAft+gJEF4gagikuBskEzbD6VihgTefWrIddn d6+UKs6cHBzxeMjoDn64OZNg76Y3roNn5e50vlJZJluGenhMnSlZiUZahvotUBj5uiyi 3h54ruFnjG7k7IHHRE/Ay/aA/Lo6jQ+nnmifdSYdS9hKhtIMYyz8JvJ9kautb9BirSbO YJ4yY0AIvV8gESqVoZfIqclvlRexnc9WQckTpUwQreyBplHI0id0BQIH4eKVsC2nTWl0 RYzkEBVGhSG8ZGs6ksdfyJDtOgSXym230HLba0YzTnSHF0jWIDsb1iQQust+BZRNbIXp 9wGg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gj32-20020a170907742000b00880823a20a3si5528402ejc.120.2023.02.04.02.50.20; Sat, 04 Feb 2023 02:50:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72BE168B9DC; Sat, 4 Feb 2023 12:50:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEC1B68B9DC for ; Sat, 4 Feb 2023 12:50:11 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B79AD2404F8 for ; Sat, 4 Feb 2023 11:50:11 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id sfC_DeiLVQuF for ; Sat, 4 Feb 2023 11:50:11 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 1E0E42404EE for ; Sat, 4 Feb 2023 11:50:11 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 557983A03D9 for ; Sat, 4 Feb 2023 11:44:05 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:37 +0100 Message-Id: <20230204104204.20721-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 06/33] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Bqwjaez2dhSa From: 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 Signed-off-by: Anton Khirnov --- libavcodec/avcodec.h | 5 ----- libavcodec/mpeg12enc.c | 1 - 2 files changed, 6 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b9bd69a2ec7..d8f22f58007 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -343,11 +343,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 b5951e43070..26cf33a3c68 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) {