wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avutil: remove deprecated FF_API_FRAME_KEY

Browse source 
Deprecated since 2023-05-04.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2025-02-19 13:58:04 -03:00
parent 8af3331883
commit 1061689ad8
8 changed files with 0 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libavcodec/decode.c
View file

@ -670,11 +670,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
return ret; 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->best_effort_timestamp = guess_correct_pts(dc,
frame->pts, frame->pts,
frame->pkt_dts); frame->pkt_dts);

7
libavcodec/encode.c
View file

@ -214,13 +214,6 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame)
av_frame_move_ref(frame, avci->buffer_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; return 0;
} }

7
libavfilter/buffersrc.c
View file

@ -252,13 +252,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra
return AVERROR(ENOMEM); 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) if (copy->colorspace == AVCOL_SPC_UNSPECIFIED)
copy->colorspace = ctx->outputs[0]->colorspace; copy->colorspace = ctx->outputs[0]->colorspace;
if (copy->color_range == AVCOL_RANGE_UNSPECIFIED) if (copy->color_range == AVCOL_RANGE_UNSPECIFIED)

7
libavfilter/vf_coreimage.m
View file

@ -299,13 +299,6 @@ static int request_frame(AVFilterLink *link)
frame->duration = 1; frame->duration = 1;
frame->flags |= AV_FRAME_FLAG_KEY; frame->flags |= AV_FRAME_FLAG_KEY;
frame->flags &= ~AV_FRAME_FLAG_INTERLACED; 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->pict_type = AV_PICTURE_TYPE_I;
frame->sample_aspect_ratio = ctx->sar; frame->sample_aspect_ratio = ctx->sar;

6
libavfilter/vsrc_gradients.c
View file

@ -408,12 +408,6 @@ static int activate(AVFilterContext *ctx)
if (!frame) if (!frame)
return AVERROR(ENOMEM); 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_KEY;
frame->flags &= ~AV_FRAME_FLAG_INTERLACED; frame->flags &= ~AV_FRAME_FLAG_INTERLACED;
frame->pict_type = AV_PICTURE_TYPE_I; frame->pict_type = AV_PICTURE_TYPE_I;

5
libavutil/frame.c
View file

@ -221,11 +221,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy)
{ {
int ret; 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->pict_type = src->pict_type;
dst->sample_aspect_ratio = src->sample_aspect_ratio; dst->sample_aspect_ratio = src->sample_aspect_ratio;
dst->crop_top = src->crop_top; dst->crop_top = src->crop_top;

10
libavutil/frame.h
View file

@ -496,16 +496,6 @@ typedef struct AVFrame {
*/ */
int format; 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. * Picture type of the frame.
*/ */

1
libavutil/version.h
View file

@ -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_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60)
#define FF_API_VULKAN_CONTIGUOUS_MEMORY (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) #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60)