Deprecated since 2023-05-04.
Unified · Split
| @@ -670,11 +670,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) · 669 unmodified lines | |||
| 670 | return ret; | 670 | return ret; |
| 671 | } | 671 | } |
| 672 | 672 | ||
| 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 | ||
| 678 | frame->best_effort_timestamp = guess_correct_pts(dc, | 673 | frame->best_effort_timestamp = guess_correct_pts(dc, |
| 679 | frame->pts, | 674 | frame->pts, |
| 680 | frame->pkt_dts); | 675 | frame->pkt_dts); |
| @@ -214,13 +214,6 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) · 213 unmodified lines | |||
| 214 | 214 | ||
| 215 | av_frame_move_ref(frame, avci->buffer_frame); | 215 | av_frame_move_ref(frame, avci->buffer_frame); |
| 216 | 216 | ||
| 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 | |||
| 224 | return 0; | 217 | return 0; |
| 225 | } | 218 | } |
| 226 | 219 | ||
| @@ -252,13 +252,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra · 251 unmodified lines | |||
| 252 | return AVERROR(ENOMEM); | 252 | return AVERROR(ENOMEM); |
| 253 | } | 253 | } |
| 254 | 254 | ||
| 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 | |||
| 262 | if (copy->colorspace == AVCOL_SPC_UNSPECIFIED) | 255 | if (copy->colorspace == AVCOL_SPC_UNSPECIFIED) |
| 263 | copy->colorspace = ctx->outputs[0]->colorspace; | 256 | copy->colorspace = ctx->outputs[0]->colorspace; |
| 264 | if (copy->color_range == AVCOL_RANGE_UNSPECIFIED) | 257 | if (copy->color_range == AVCOL_RANGE_UNSPECIFIED) |
| @@ -299,13 +299,6 @@ static int request_frame(AVFilterLink *link) · 298 unmodified lines | |||
| 299 | frame->duration = 1; | 299 | frame->duration = 1; |
| 300 | frame->flags |= AV_FRAME_FLAG_KEY; | 300 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 301 | frame->flags &= ~AV_FRAME_FLAG_INTERLACED; | 301 | 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 | |||
| 309 | frame->pict_type = AV_PICTURE_TYPE_I; | 302 | frame->pict_type = AV_PICTURE_TYPE_I; |
| 310 | frame->sample_aspect_ratio = ctx->sar; | 303 | frame->sample_aspect_ratio = ctx->sar; |
| 311 | 304 | ||
| @@ -408,12 +408,6 @@ static int activate(AVFilterContext *ctx) · 407 unmodified lines | |||
| 408 | if (!frame) | 408 | if (!frame) |
| 409 | return AVERROR(ENOMEM); | 409 | return AVERROR(ENOMEM); |
| 410 | 410 | ||
| 411 | #if FF_API_FRAME_KEY | ||
| 412 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 413 | frame->key_frame = 1; | ||
| 414 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 415 | #endif | ||
| 416 | |||
| 417 | frame->flags |= AV_FRAME_FLAG_KEY; | 411 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 418 | frame->flags &= ~AV_FRAME_FLAG_INTERLACED; | 412 | frame->flags &= ~AV_FRAME_FLAG_INTERLACED; |
| 419 | frame->pict_type = AV_PICTURE_TYPE_I; | 413 | frame->pict_type = AV_PICTURE_TYPE_I; |
| @@ -221,11 +221,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) · 220 unmodified lines | |||
| 221 | { | 221 | { |
| 222 | int ret; | 222 | int ret; |
| 223 | 223 | ||
| 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 | ||
| 229 | dst->pict_type = src->pict_type; | 224 | dst->pict_type = src->pict_type; |
| 230 | dst->sample_aspect_ratio = src->sample_aspect_ratio; | 225 | dst->sample_aspect_ratio = src->sample_aspect_ratio; |
| 231 | dst->crop_top = src->crop_top; | 226 | dst->crop_top = src->crop_top; |
| @@ -496,16 +496,6 @@ typedef struct AVFrame { · 495 unmodified lines | |||
| 496 | */ | 496 | */ |
| 497 | int format; | 497 | int format; |
| 498 | 498 | ||
| 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 | |||
| 509 | /** | 499 | /** |
| 510 | * Picture type of the frame. | 500 | * Picture type of the frame. |
| 511 | */ | 501 | */ |
| @@ -105,7 +105,6 @@ · 104 unmodified lines | |||
| 105 | * @{ | 105 | * @{ |
| 106 | */ | 106 | */ |
| 107 | 107 | ||
| 108 | #define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60) | ||
| 109 | #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60) | 108 | #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60) |
| 110 | #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60) | 109 | #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60) |
| 111 | #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60) | 110 | #define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60) |