History

avutil: remove deprecated FF_API_FRAME_KEY

Deprecated since 2023-05-04.

James Almer committed 1 year ago

Commit 10616891 parent 8af33318 files · +0 −48Browse files

Unified · Split

8 files
  1. libavcodec/decode.c +0 −5
  2. libavcodec/encode.c +0 −7
  3. libavfilter/buffersrc.c +0 −7
  4. libavfilter/vf_coreimage.m +0 −7
  5. libavfilter/vsrc_gradients.c +0 −6
  6. libavutil/frame.c +0 −5
  7. libavutil/frame.h +0 −10
  8. libavutil/version.h +0 −1
libavcodec/decode.c+0−5
@@ -670,11 +670,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) · 669 unmodified lines
670670 return ret;
671671 }
672672
673−#if FF_API_FRAME_KEY
674−FF_DISABLE_DEPRECATION_WARNINGS
675− frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY);
676−FF_ENABLE_DEPRECATION_WARNINGS
677−#endif
678673 frame->best_effort_timestamp = guess_correct_pts(dc,
679674 frame->pts,
680675 frame->pkt_dts);
libavcodec/encode.c+0−7
@@ -214,13 +214,6 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) · 213 unmodified lines
214214
215215 av_frame_move_ref(frame, avci->buffer_frame);
216216
217−#if FF_API_FRAME_KEY
218−FF_DISABLE_DEPRECATION_WARNINGS
219− if (frame->key_frame)
220− frame->flags |= AV_FRAME_FLAG_KEY;
221−FF_ENABLE_DEPRECATION_WARNINGS
222−#endif
223−
224217 return 0;
225218 }
226219
libavfilter/buffersrc.c+0−7
@@ -252,13 +252,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra · 251 unmodified lines
252252 return AVERROR(ENOMEM);
253253 }
254254
255−#if FF_API_FRAME_KEY
256−FF_DISABLE_DEPRECATION_WARNINGS
257− if (copy->key_frame)
258− copy->flags |= AV_FRAME_FLAG_KEY;
259−FF_ENABLE_DEPRECATION_WARNINGS
260−#endif
261−
262255 if (copy->colorspace == AVCOL_SPC_UNSPECIFIED)
263256 copy->colorspace = ctx->outputs[0]->colorspace;
264257 if (copy->color_range == AVCOL_RANGE_UNSPECIFIED)
libavfilter/vf_coreimage.m+0−7
@@ -299,13 +299,6 @@ static int request_frame(AVFilterLink *link) · 298 unmodified lines
299299 frame->duration = 1;
300300 frame->flags |= AV_FRAME_FLAG_KEY;
301301 frame->flags &= ~AV_FRAME_FLAG_INTERLACED;
302−
303−FF_DISABLE_DEPRECATION_WARNINGS
304−#if FF_API_FRAME_KEY
305− frame->key_frame = 1;
306−#endif
307−FF_ENABLE_DEPRECATION_WARNINGS
308−
309302 frame->pict_type = AV_PICTURE_TYPE_I;
310303 frame->sample_aspect_ratio = ctx->sar;
311304
libavfilter/vsrc_gradients.c+0−6
@@ -408,12 +408,6 @@ static int activate(AVFilterContext *ctx) · 407 unmodified lines
408408 if (!frame)
409409 return AVERROR(ENOMEM);
410410
411−#if FF_API_FRAME_KEY
412−FF_DISABLE_DEPRECATION_WARNINGS
413− frame->key_frame = 1;
414−FF_ENABLE_DEPRECATION_WARNINGS
415−#endif
416−
417411 frame->flags |= AV_FRAME_FLAG_KEY;
418412 frame->flags &= ~AV_FRAME_FLAG_INTERLACED;
419413 frame->pict_type = AV_PICTURE_TYPE_I;
libavutil/frame.c+0−5
@@ -221,11 +221,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) · 220 unmodified lines
221221 {
222222 int ret;
223223
224−#if FF_API_FRAME_KEY
225−FF_DISABLE_DEPRECATION_WARNINGS
226− dst->key_frame = src->key_frame;
227−FF_ENABLE_DEPRECATION_WARNINGS
228−#endif
229224 dst->pict_type = src->pict_type;
230225 dst->sample_aspect_ratio = src->sample_aspect_ratio;
231226 dst->crop_top = src->crop_top;
libavutil/frame.h+0−10
@@ -496,16 +496,6 @@ typedef struct AVFrame { · 495 unmodified lines
496496 */
497497 int format;
498498
499−#if FF_API_FRAME_KEY
500− /**
501− * 1 -> keyframe, 0-> not
502− *
503− * @deprecated Use AV_FRAME_FLAG_KEY instead
504− */
505− attribute_deprecated
506− int key_frame;
507−#endif
508−
509499 /**
510500 * Picture type of the frame.
511501 */
libavutil/version.h+0−1
@@ -105,7 +105,6 @@ · 104 unmodified lines
105105 * @{
106106 */
107107
108−#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)
109108 #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60)
110109 #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60)
111110 #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t