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 98B924D759 for ; Sun, 23 Feb 2025 22:11:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 306BE68CD1D; Mon, 24 Feb 2025 00:07:28 +0200 (EET) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 497E768CC65 for ; Mon, 24 Feb 2025 00:07:23 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fcf3a69c3cso2934646a91.1 for ; Sun, 23 Feb 2025 14:07:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348441; x=1740953241; 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=tBC7dYSbFQNw3gdgSOoKWPEUNnflYfd7shvj5jg142U=; b=VR5tTww4shI2v5nKKfeMfpBwt+NWU1Bl5bK5qeyRlwr07LygkWDJqRxlym+NzwQlvc Ac5ATnIlnubpAVMSTlrGSdkF9OH8Y3+ihcj89Q901qA2p0gFlwol4YR9xuD+n+/4Rzsz 2KwFzwioiUn6kLv7IXc3Nv8L5mAwdRnDNplG++lbmOhsYuGLcPxg23pJKgIH58WejqP5 r7hAnmN8qMoRGuZQAOkwY0I0qhmXkOGf0BpAxnXIY7jKdMe4QDR7qYVKaph+8646igHU DiVHS1RHXVTWNfnwEgRFeb8B7Mgr1KQn6RheYEfDIAbsxVCQyg9ofMelmJ9MGUtItXjw SWnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348441; x=1740953241; 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=tBC7dYSbFQNw3gdgSOoKWPEUNnflYfd7shvj5jg142U=; b=NJskBiCEPS2rAR83tUcT7FH8YI1N489ZqvnJnFEbScxOimbxyf44h429bnatTAgjPR xL9SiY5LSjRYHhkzAMjuhvxINqWR7ddIpVVaix8vMD9koIzBeZsPMA4Fr+oBVAOpMPri /Ic9ZBtxhOWB/ZW+0qSYDAW1IKRjDOvF/mIY3lmKIJxn+WNa6Jo1eFz/Xte6cSl1xBQ/ PRDX9cI5VPA8aiIFSgkcO9XtdG+I/d10qqvsnm4oVgAFjCW1LRxtEyXaq2RGFBW3xVon rFShyBpl/NyFMe++r+Pvu0ZZpsN5b5ys+8FTk6rycCCOzquerWGD5rKupE9FN6fYws7A QFlw== X-Gm-Message-State: AOJu0YyIaLd9mU2s4wxrgvpQnilTNdxV8L9OPVLUTVOTIp+tIrGDHEV6 ceDldr2uqHmU+Gu1IaseP3MJmAB1pmM6Op9lTcMK94ytc9rkEtBH8W4eSG9E X-Gm-Gg: ASbGnctBK/vSn7LX03S6S8GvYJGE/PcAelmoRxVlDDvXpvql4PKA6nZAYhy6ferOqAZ TVjTEtucKH4yAU5uf9eELI4upENVc9O7gzXHXs80CkFJ8p9XP/85bjgj/hpfuZWawAgIrd9ET9H xUOLtP39xT8+ZSkbYbsu68CXKHkn5T8o+/cuMTZZ+1fNzSFWztlSLmtwU4x1b6+5d/ouqFQ4Hku IWhAO4qPdOiz4STvxoY24ekzbHV02NUSN9Q8B8DSIsgA443j36Jg9GBunaULzG+HCGGM/LS9pug kEk6J2U0ZsoXkSON7oe4UIh6PMDlyQfdE6FXtpcy1A== X-Google-Smtp-Source: AGHT+IEIBAJkPJZdYWOKy9+ZedoTz9Z4gP7QVgcB8ifbSYEdwy7DwcUGlV5akhPNa/OjTad5s9KU7A== X-Received: by 2002:a17:90b:4ac7:b0:2ea:2a8d:dd2a with SMTP id 98e67ed59e1d1-2fce7af3f5fmr18622588a91.27.1740348439001; Sun, 23 Feb 2025 14:07:19 -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.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:07:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:24 -0300 Message-ID: <20250223220630.18756-25-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 24/30] avutil: remove deprecated FF_API_INTERLACED_FRAME 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 | 6 ------ libavcodec/encode.c | 8 -------- libavfilter/buffersrc.c | 9 --------- libavfilter/qsvvpp.c | 5 ----- libavfilter/vf_coreimage.m | 3 --- libavfilter/vf_deinterlace_vaapi.c | 5 ----- libavfilter/vf_estdif.c | 5 ----- libavfilter/vf_field.c | 5 ----- libavfilter/vf_fieldhint.c | 10 ---------- libavfilter/vf_fieldmatch.c | 10 ---------- libavfilter/vf_fieldorder.c | 5 ----- libavfilter/vf_idet.c | 32 ------------------------------ libavfilter/vf_kerndeint.c | 5 ----- libavfilter/vf_nnedi.c | 5 ----- libavfilter/vf_separatefields.c | 5 ----- libavfilter/vf_setparams.c | 11 ---------- libavfilter/vf_telecine.c | 18 ----------------- libavfilter/vf_tinterlace.c | 23 --------------------- libavfilter/vf_w3fdif.c | 5 ----- libavfilter/vf_weave.c | 6 ------ libavfilter/vsrc_gradients.c | 5 ----- libavfilter/vsrc_testsrc.c | 5 ----- libavfilter/yadif_common.c | 10 ---------- libavutil/frame.c | 6 ------ libavutil/frame.h | 18 ----------------- libavutil/version.h | 1 - 26 files changed, 226 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 271345cff1..455adff25c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -674,12 +674,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) FF_DISABLE_DEPRECATION_WARNINGS frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); FF_ENABLE_DEPRECATION_WARNINGS -#endif -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED); - frame->top_field_first = !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST); -FF_ENABLE_DEPRECATION_WARNINGS #endif frame->best_effort_timestamp = guess_correct_pts(dc, frame->pts, diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 7935bb971b..d831cac13b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -219,14 +219,6 @@ FF_DISABLE_DEPRECATION_WARNINGS if (frame->key_frame) frame->flags |= AV_FRAME_FLAG_KEY; FF_ENABLE_DEPRECATION_WARNINGS -#endif -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - if (frame->interlaced_frame) - frame->flags |= AV_FRAME_FLAG_INTERLACED; - if (frame->top_field_first) - frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; -FF_ENABLE_DEPRECATION_WARNINGS #endif return 0; diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 7edec7ee77..d41d1112d4 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -252,15 +252,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra return AVERROR(ENOMEM); } -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - if (copy->interlaced_frame) - copy->flags |= AV_FRAME_FLAG_INTERLACED; - if (copy->top_field_first) - copy->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - #if FF_API_FRAME_KEY FF_DISABLE_DEPRECATION_WARNINGS if (copy->key_frame) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 67ae23b165..c3685f126c 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -536,11 +536,6 @@ static QSVFrame *query_frame(QSVVPPContext *s, AVFilterLink *outlink, const AVFr mfxExtBuffer *extbuf = s->vpp_param.ExtParam[i]; if (extbuf->BufferId == MFX_EXTBUFF_VPP_DEINTERLACING) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out_frame->frame->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out_frame->frame->flags &= ~AV_FRAME_FLAG_INTERLACED; break; } diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index ec7eaa4b80..9e03c46ce5 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -304,9 +304,6 @@ FF_DISABLE_DEPRECATION_WARNINGS #if FF_API_FRAME_KEY frame->key_frame = 1; #endif -#if FF_API_INTERLACED_FRAME - frame->interlaced_frame = 0; -#endif FF_ENABLE_DEPRECATION_WARNINGS frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index e37c2835bb..4bb109336a 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -304,11 +304,6 @@ static int deint_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) output_frame->pts = input_frame->pts + ctx->frame_queue[current_frame_index + 1]->pts; } -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - output_frame->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif output_frame->flags &= ~AV_FRAME_FLAG_INTERLACED; av_log(avctx, AV_LOG_DEBUG, "Filter output: %s, %ux%u (%"PRId64").\n", diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index 08360533d1..b8289a6e96 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -440,11 +440,6 @@ static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts, int64_t durati if (!out) return AVERROR(ENOMEM); av_frame_copy_props(out, in); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags &= ~AV_FRAME_FLAG_INTERLACED; out->pts = pts; out->duration = duration; diff --git a/libavfilter/vf_field.c b/libavfilter/vf_field.c index 801fc42ce5..40fcf73bc4 100644 --- a/libavfilter/vf_field.c +++ b/libavfilter/vf_field.c @@ -73,11 +73,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) int i; inpicref->height = outlink->h; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - inpicref->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif inpicref->flags &= ~AV_FRAME_FLAG_INTERLACED; for (i = 0; i < field->nb_planes; i++) { diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index 20f13e34d3..6f4403a48d 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -223,19 +223,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) switch (hint) { case '+': -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED; break; case '-': -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags &= ~AV_FRAME_FLAG_INTERLACED; break; case '=': diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index 5e68ad0e49..60b4a602cb 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -823,20 +823,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) /* mark the frame we are unable to match properly as interlaced so a proper * de-interlacer can take the relay */ -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->interlaced_frame = interlaced_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (interlaced_frame) { dst->flags |= AV_FRAME_FLAG_INTERLACED; av_log(ctx, AV_LOG_WARNING, "Frame #%"PRId64" at %s is still interlaced\n", outl->frame_count_in, av_ts2timestr(in->pts, &inlink->time_base)); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->top_field_first = field; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (field) dst->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; else diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index dc5cb87517..fe999f27ea 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -142,11 +142,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } } } -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->top_field_first = s->dst_tff; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->dst_tff) out->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; else diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 15ed489eb6..445ecc203a 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -183,28 +183,11 @@ static void filter(AVFilterContext *ctx) } if (idet->last_type == TFF){ -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - idet->cur->top_field_first = 1; - idet->cur->interlaced_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif idet->cur->flags |= (AV_FRAME_FLAG_INTERLACED | AV_FRAME_FLAG_TOP_FIELD_FIRST); }else if(idet->last_type == BFF){ -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - idet->cur->top_field_first = 0; - idet->cur->interlaced_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif idet->cur->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; idet->cur->flags |= AV_FRAME_FLAG_INTERLACED; }else if(idet->last_type == PROGRESSIVE){ -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - idet->cur->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif idet->cur->flags &= ~AV_FRAME_FLAG_INTERLACED; } @@ -260,11 +243,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *picref) } if (idet->analyze_interlaced_flag_done) { if ((picref->flags & AV_FRAME_FLAG_INTERLACED) && idet->interlaced_flag_accuracy < 0) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - picref->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif picref->flags &= ~AV_FRAME_FLAG_INTERLACED; } return ff_filter_frame(ctx->outputs[0], picref); @@ -305,11 +283,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (idet->analyze_interlaced_flag) { if (idet->cur->flags & AV_FRAME_FLAG_INTERLACED) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - idet->cur->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif idet->cur->flags &= ~AV_FRAME_FLAG_INTERLACED; filter(ctx); if (idet->last_type == PROGRESSIVE) { @@ -323,11 +296,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_filter_frame(ctx->outputs[0], av_frame_clone(idet->cur)); if ((idet->next->flags & AV_FRAME_FLAG_INTERLACED) && idet->interlaced_flag_accuracy < 0) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - idet->next->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif idet->next->flags &= ~AV_FRAME_FLAG_INTERLACED; } idet->analyze_interlaced_flag_done = 1; diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index d6f65a2dc4..f37e6b05d3 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -142,11 +142,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) return AVERROR(ENOMEM); } av_frame_copy_props(outpic, inpic); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - outpic->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif outpic->flags &= ~AV_FRAME_FLAG_INTERLACED; for (plane = 0; plane < 4 && inpic->data[plane] && inpic->linesize[plane]; plane++) { diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 113252ebd0..d3f52b3f94 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -668,11 +668,6 @@ static int get_frame(AVFilterContext *ctx, int is_second) if (!dst) return AVERROR(ENOMEM); av_frame_copy_props(dst, s->prev); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->flags &= ~AV_FRAME_FLAG_INTERLACED; dst->pts = s->pts; diff --git a/libavfilter/vf_separatefields.c b/libavfilter/vf_separatefields.c index 2933570358..c0c0640dcc 100644 --- a/libavfilter/vf_separatefields.c +++ b/libavfilter/vf_separatefields.c @@ -72,11 +72,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) int ret; inpicref->height = outlink->h; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - inpicref->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif inpicref->flags &= ~AV_FRAME_FLAG_INTERLACED; if (!s->second) { diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c index 34583b1d10..751750e6c0 100644 --- a/libavfilter/vf_setparams.c +++ b/libavfilter/vf_setparams.c @@ -167,19 +167,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) /* set field */ if (s->field_mode == MODE_PROG) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->flags &= ~AV_FRAME_FLAG_INTERLACED; } else if (s->field_mode != MODE_AUTO) { -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = 1; - frame->top_field_first = s->field_mode; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->flags |= AV_FRAME_FLAG_INTERLACED; if (s->field_mode) frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c index e64e400d9f..292b2ee625 100644 --- a/libavfilter/vf_telecine.c +++ b/libavfilter/vf_telecine.c @@ -209,12 +209,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) s->stride[i], (s->planeheight[i] - !s->first_field + 1) / 2); } -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - s->frame[nout]->interlaced_frame = 1; - s->frame[nout]->top_field_first = !s->first_field; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->frame[nout]->flags |= AV_FRAME_FLAG_INTERLACED; if (s->first_field) s->frame[nout]->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; @@ -237,12 +231,6 @@ FF_ENABLE_DEPRECATION_WARNINGS inpicref->data[i], inpicref->linesize[i], s->stride[i], s->planeheight[i]); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - s->frame[nout]->interlaced_frame = inpicref->interlaced_frame; - s->frame[nout]->top_field_first = inpicref->top_field_first; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->frame[nout]->flags |= (inpicref->flags & (AV_FRAME_FLAG_INTERLACED | AV_FRAME_FLAG_TOP_FIELD_FIRST)); nout++; len -= 2; @@ -269,12 +257,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } av_frame_copy_props(frame, inpicref); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = interlaced; - frame->top_field_first = tff; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (interlaced) frame->flags |= AV_FRAME_FLAG_INTERLACED; else diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index de7cd88103..8b04926faa 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -405,12 +405,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) return AVERROR(ENOMEM); av_frame_copy_props(out, cur); out->height = outlink->h; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; - out->top_field_first = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED | AV_FRAME_FLAG_TOP_FIELD_FIRST; out->sample_aspect_ratio = av_mul_q(cur->sample_aspect_ratio, av_make_q(2, 1)); @@ -479,12 +473,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!out) return AVERROR(ENOMEM); av_frame_copy_props(out, cur); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; - out->top_field_first = tff; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED; if (tff) out->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; @@ -510,11 +498,6 @@ FF_ENABLE_DEPRECATION_WARNINGS out = av_frame_clone(cur); if (!out) return AVERROR(ENOMEM); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED; if (cur->pts != AV_NOPTS_VALUE) out->pts = cur->pts*2; @@ -530,12 +513,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!out) return AVERROR(ENOMEM); av_frame_copy_props(out, next); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; - out->top_field_first = !tff; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED; if (tff) out->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index 0635edc7f0..5b4c83bbd9 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -488,11 +488,6 @@ static int filter(AVFilterContext *ctx, int is_second) if (!out) return AVERROR(ENOMEM); av_frame_copy_props(out, s->cur); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags &= ~AV_FRAME_FLAG_INTERLACED; if (!is_second) { diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index c978c47ad4..91c98e0e66 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -161,12 +161,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) FFMIN(s->planeheight[1], ff_filter_get_nb_threads(ctx))); out->pts = s->double_weave ? s->prev->pts : in->pts / 2; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - out->interlaced_frame = 1; - out->top_field_first = !s->first_field; -FF_ENABLE_DEPRECATION_WARNINGS -#endif out->flags |= AV_FRAME_FLAG_INTERLACED; if (s->first_field) out->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST; diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index 0c5a9dbf53..d4dc2b1bc5 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -415,11 +415,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif frame->flags |= AV_FRAME_FLAG_KEY; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->flags &= ~AV_FRAME_FLAG_INTERLACED; frame->pict_type = AV_PICTURE_TYPE_I; frame->sample_aspect_ratio = (AVRational) {1, 1}; diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index c842cacceb..ef51161adb 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -205,11 +205,6 @@ static int activate(AVFilterContext *ctx) frame->pts = test->pts; frame->duration = 1; frame->flags |= AV_FRAME_FLAG_KEY; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - frame->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->flags &= ~AV_FRAME_FLAG_INTERLACED; frame->pict_type = AV_PICTURE_TYPE_I; frame->sample_aspect_ratio = test->sar; diff --git a/libavfilter/yadif_common.c b/libavfilter/yadif_common.c index 059b44ba22..a6cd981684 100644 --- a/libavfilter/yadif_common.c +++ b/libavfilter/yadif_common.c @@ -44,11 +44,6 @@ static int return_frame(AVFilterContext *ctx, int is_second) return AVERROR(ENOMEM); av_frame_copy_props(yadif->out, yadif->cur); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - yadif->out->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif yadif->out->flags &= ~AV_FRAME_FLAG_INTERLACED; if (yadif->current_field == YADIF_FIELD_BACK_END) yadif->current_field = YADIF_FIELD_END; @@ -164,11 +159,6 @@ int ff_yadif_filter_frame(AVFilterLink *link, AVFrame *frame) return AVERROR(ENOMEM); av_frame_copy_props(yadif->out, yadif->cur); -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - yadif->out->interlaced_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif yadif->out->flags &= ~AV_FRAME_FLAG_INTERLACED; if (yadif->out->pts != AV_NOPTS_VALUE) diff --git a/libavutil/frame.c b/libavutil/frame.c index 5434021f44..b745a7df01 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -328,12 +328,6 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->pts = src->pts; dst->duration = src->duration; dst->repeat_pict = src->repeat_pict; -#if FF_API_INTERLACED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->interlaced_frame = src->interlaced_frame; - dst->top_field_first = src->top_field_first; -FF_ENABLE_DEPRECATION_WARNINGS -#endif #if FF_API_PALETTE_HAS_CHANGED FF_DISABLE_DEPRECATION_WARNINGS dst->palette_has_changed = src->palette_has_changed; diff --git a/libavutil/frame.h b/libavutil/frame.h index 5f89acbe2f..a6667aadce 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -577,24 +577,6 @@ typedef struct AVFrame { */ int repeat_pict; -#if FF_API_INTERLACED_FRAME - /** - * The content of the picture is interlaced. - * - * @deprecated Use AV_FRAME_FLAG_INTERLACED instead - */ - attribute_deprecated - int interlaced_frame; - - /** - * If the content is interlaced, is top field displayed first. - * - * @deprecated Use AV_FRAME_FLAG_TOP_FIELD_FIRST instead - */ - attribute_deprecated - int top_field_first; -#endif - #if FF_API_PALETTE_HAS_CHANGED /** * Tell user application that palette has changed from previous frame. diff --git a/libavutil/version.h b/libavutil/version.h index 879444718a..f4fc2e4855 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60) #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) -- 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".