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 ESMTPS id 9321C4D70E for ; Sun, 23 Feb 2025 22:11:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B6FF68CCFB; Mon, 24 Feb 2025 00:07:27 +0200 (EET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26F2A68CC65 for ; Mon, 24 Feb 2025 00:07:23 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-220c8cf98bbso85086965ad.1 for ; Sun, 23 Feb 2025 14:07:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348440; x=1740953240; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qxAXHU7W3SiagZqb4llG/55Shr1GfrTmo10NajyTwFs=; b=Hzv3n3Ke8EbMzOIR4JsLhmZplCwTzlWet+izpe7MR+3SKnhfFI5cdtUwTpKuOKeIx/ inHNo5+M2hGu8ZAJ7A0gJoiegPrtobjF5waT+0fxPqTbkG53nd38Z19vK7FuYl+rCIGZ /zTqScRi9FKhGrBjooqs57HLQNqh8LKNrXn3ksvrkxg1tzWie2NNX/5LFFUXSXkbjgd+ N3f+toSccnzNSaE2HqQPJjMCAw8DNke69fGQFuC4M+UXWSmtTfg5g0pCOizFO20QUgmC AN7ivULPr0x6ZEuZSv+vpKoIDCbt3jgHvhVEomP195ZpUgAxcjSSLCnsgOTf5jGRRTiP ZpqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348440; x=1740953240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qxAXHU7W3SiagZqb4llG/55Shr1GfrTmo10NajyTwFs=; b=cOFt0MRLuy8ExU3tpRGN3oi7Z4Zg9Z35D680nfGlR910aawcf1abZegdEAp2cODMHF Lgozl894hsM8XIWwQJSLP4kg3UY5rKP6upt1pWW4cHmjxj9RVXRf3kmCU/mK7H/0/u4M Cj1PGQ8ukKeVlYlYe994nrHB7CGaIMssjVHeRD68FG/4gMsd8kd/3g8yhcgv6uI1l1NY Pn/PmvoHuqjOf/lHb8TcvVdaL1vLk0aNUrDWn/9oa7kuVE0OEB0SNr7O3gG+ypAnqG1Q mlhv5/hdNHzuj/Mg0304s59ZnkP10sA0iW+uhaowOXLxeqHiWhHIdohxamdEXRdRh4qs jdNQ== X-Gm-Message-State: AOJu0YyPK94uU2O7wgiAdeah8Jzt1YKSMOtVmQFNVkJ2wTjlyJTGlKzU RTUiGCS0sXhfPaDGkmpDh0hDUD8d1nKYN4E3bvv5OfSVBE0hYlN6Zd30eCXY X-Gm-Gg: ASbGncsWPOFvnb34j1nz7qHpqJT2s4YWoin6JBQNcRB9L7OVUT1SSrL48wrhRDCqcSb Xcn7KshoECzwB7AbhMeJjG9eVa3a3XXd0PKmDW0yOkfFwu+LyhmaY7B36C+HtZElYUyACNFqRYs w8S5LoHRCKM6IuFHuy8I46Nm5rApMcth18P7RNJVD+YXzE7FfZk8eVCY2WOHIlLS/U5i8eUCnlI uvndKXrjoNe2aUdj4efM6GqNeyEhmUTNOi5nt3aN1ey1UhWQxnGR5wtNXdOsbMCuvliW3ltsUr7 g49O8Xb3Hphf2BqcuPQVZ0H+Gbd8hnkbJhP8bPvHaA== X-Google-Smtp-Source: AGHT+IHAE2s04u+ZbEkiIrRe4Pl6J6SXY/BtBXV7G5fqPVBvPs8TXmrB5BJKgoCNXo1laHjKDuDDBg== X-Received: by 2002:a17:902:ccd0:b0:21f:1096:7d5 with SMTP id d9443c01a7336-221a0ed78bcmr187635035ad.17.1740348440454; Sun, 23 Feb 2025 14:07:20 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:b49d:85a5:a7d1:4da6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fceb04bf70sm5091848a91.16.2025.02.23.14.07.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:07:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:25 -0300 Message-ID: <20250223220630.18756-26-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250223220630.18756-1-jamrial@gmail.com> References: <20250223220630.18756-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 25/30] avutil: remove deprecated FF_API_FRAME_KEY 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: Deprecated since 2023-05-04. Signed-off-by: James Almer --- libavcodec/decode.c | 5 ----- libavcodec/encode.c | 7 ------- libavfilter/buffersrc.c | 7 ------- libavfilter/vf_coreimage.m | 7 ------- libavfilter/vsrc_gradients.c | 6 ------ libavutil/frame.c | 5 ----- libavutil/frame.h | 10 ---------- libavutil/version.h | 1 - 8 files changed, 48 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 455adff25c..794f14f18d 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -670,11 +670,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) return ret; } -#if FF_API_FRAME_KEY -FF_DISABLE_DEPRECATION_WARNINGS - frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->best_effort_timestamp = guess_correct_pts(dc, frame->pts, frame->pkt_dts); diff --git a/libavcodec/encode.c b/libavcodec/encode.c index d831cac13b..72dfa8867a 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -214,13 +214,6 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) av_frame_move_ref(frame, avci->buffer_frame); -#if FF_API_FRAME_KEY -FF_DISABLE_DEPRECATION_WARNINGS - if (frame->key_frame) - frame->flags |= AV_FRAME_FLAG_KEY; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index d41d1112d4..af27306b3b 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -252,13 +252,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra return AVERROR(ENOMEM); } -#if FF_API_FRAME_KEY -FF_DISABLE_DEPRECATION_WARNINGS - if (copy->key_frame) - copy->flags |= AV_FRAME_FLAG_KEY; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (copy->colorspace == AVCOL_SPC_UNSPECIFIED) copy->colorspace = ctx->outputs[0]->colorspace; if (copy->color_range == AVCOL_RANGE_UNSPECIFIED) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 9e03c46ce5..dfa8758ce9 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -299,13 +299,6 @@ static int request_frame(AVFilterLink *link) frame->duration = 1; frame->flags |= AV_FRAME_FLAG_KEY; frame->flags &= ~AV_FRAME_FLAG_INTERLACED; - -FF_DISABLE_DEPRECATION_WARNINGS -#if FF_API_FRAME_KEY - frame->key_frame = 1; -#endif -FF_ENABLE_DEPRECATION_WARNINGS - frame->pict_type = AV_PICTURE_TYPE_I; frame->sample_aspect_ratio = ctx->sar; diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index d4dc2b1bc5..cb1b73773f 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -408,12 +408,6 @@ static int activate(AVFilterContext *ctx) if (!frame) return AVERROR(ENOMEM); -#if FF_API_FRAME_KEY -FF_DISABLE_DEPRECATION_WARNINGS - frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - frame->flags |= AV_FRAME_FLAG_KEY; frame->flags &= ~AV_FRAME_FLAG_INTERLACED; frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavutil/frame.c b/libavutil/frame.c index b745a7df01..45e0df65fa 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -314,11 +314,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { int ret; -#if FF_API_FRAME_KEY -FF_DISABLE_DEPRECATION_WARNINGS - dst->key_frame = src->key_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->pict_type = src->pict_type; dst->sample_aspect_ratio = src->sample_aspect_ratio; dst->crop_top = src->crop_top; diff --git a/libavutil/frame.h b/libavutil/frame.h index a6667aadce..60edcc4787 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -496,16 +496,6 @@ typedef struct AVFrame { */ int format; -#if FF_API_FRAME_KEY - /** - * 1 -> keyframe, 0-> not - * - * @deprecated Use AV_FRAME_FLAG_KEY instead - */ - attribute_deprecated - int key_frame; -#endif - /** * Picture type of the frame. */ diff --git a/libavutil/version.h b/libavutil/version.h index f4fc2e4855..58a25c28cd 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60) -- 2.48.1 _______________________________________________ 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".