ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Feb 19 13:58:04 2025 -0300| [1061689ad80e8e9a2f7ff8a55c955acdca4396dc] | committer: James Almer
avutil: remove deprecated FF_API_FRAME_KEY Deprecated since 2023-05-04. Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1061689ad80e8e9a2f7ff8a55c955acdca4396dc --- 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 ed46d297c7..d726cac8c9 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 5c6461442a..a0459f4544 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -221,11 +221,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 f51ed93799..ab73ba4faf 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
