Unified · Split
| @@ -572,7 +572,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) · 571 unmodified lines | ||
| 572 | 572 | if (!ret) { |
| 573 | 573 | if (avctx->codec_type != AVMEDIA_TYPE_VIDEO) |
| 574 | 574 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 575 | +#if FF_API_FRAME_KEY | |
| 576 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 575 | 577 | frame->key_frame = !!(frame->flags & AV_FRAME_FLAG_KEY); |
| 578 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 579 | +#endif | |
| 576 | 580 | #if FF_API_INTERLACED_FRAME |
| 577 | 581 | FF_DISABLE_DEPRECATION_WARNINGS |
| 578 | 582 | frame->interlaced_frame = !!(frame->flags & AV_FRAME_FLAG_INTERLACED); |
| @@ -192,8 +192,12 @@ int ff_encode_get_frame(AVCodecContext *avctx, AVFrame *frame) · 191 unmodified lines | ||
| 192 | 192 | |
| 193 | 193 | av_frame_move_ref(frame, avci->buffer_frame); |
| 194 | 194 | |
| 195 | +#if FF_API_FRAME_KEY | |
| 196 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 195 | 197 | if (frame->key_frame) |
| 196 | 198 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 199 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 200 | +#endif | |
| 197 | 201 | #if FF_API_INTERLACED_FRAME |
| 198 | 202 | FF_DISABLE_DEPRECATION_WARNINGS |
| 199 | 203 | if (frame->interlaced_frame) |
| @@ -256,8 +256,12 @@ FF_DISABLE_DEPRECATION_WARNINGS · 255 unmodified lines | ||
| 256 | 256 | FF_ENABLE_DEPRECATION_WARNINGS |
| 257 | 257 | #endif |
| 258 | 258 | |
| 259 | +#if FF_API_FRAME_KEY | |
| 260 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 259 | 261 | if (copy->key_frame) |
| 260 | 262 | copy->flags |= AV_FRAME_FLAG_KEY; |
| 263 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 264 | +#endif | |
| 261 | 265 | |
| 262 | 266 | ret = ff_filter_frame(ctx->outputs[0], copy); |
| 263 | 267 | if (ret < 0) |
| @@ -301,7 +301,9 @@ static int request_frame(AVFilterLink *link) · 300 unmodified lines | ||
| 301 | 301 | |
| 302 | 302 | frame->pts = ctx->pts; |
| 303 | 303 | frame->duration = 1; |
| 304 | +#if FF_API_FRAME_KEY | |
| 304 | 305 | frame->key_frame = 1; |
| 306 | +#endif | |
| 305 | 307 | frame->flags |= AV_FRAME_FLAG_KEY |
| 306 | 308 | #if FF_API_INTERLACED_FRAME |
| 307 | 309 | frame->interlaced_frame = 0; |
| @@ -397,7 +397,12 @@ static int activate(AVFilterContext *ctx) · 396 unmodified lines | ||
| 397 | 397 | if (!frame) |
| 398 | 398 | return AVERROR(ENOMEM); |
| 399 | 399 | |
| 400 | +#if FF_API_FRAME_KEY | |
| 401 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 400 | 402 | frame->key_frame = 1; |
| 403 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 404 | +#endif | |
| 405 | + | |
| 401 | 406 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 402 | 407 | #if FF_API_INTERLACED_FRAME |
| 403 | 408 | FF_DISABLE_DEPRECATION_WARNINGS |
| @@ -184,7 +184,11 @@ static int activate(AVFilterContext *ctx) · 183 unmodified lines | ||
| 184 | 184 | return AVERROR(ENOMEM); |
| 185 | 185 | frame->pts = test->pts; |
| 186 | 186 | frame->duration = 1; |
| 187 | +#if FF_API_PKT_DURATION | |
| 188 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 187 | 189 | frame->key_frame = 1; |
| 190 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 191 | +#endif | |
| 188 | 192 | frame->flags |= AV_FRAME_FLAG_KEY; |
| 189 | 193 | #if FF_API_INTERLACED_FRAME |
| 190 | 194 | FF_DISABLE_DEPRECATION_WARNINGS |
| @@ -55,7 +55,6 @@ FF_DISABLE_DEPRECATION_WARNINGS · 54 unmodified lines | ||
| 55 | 55 | FF_ENABLE_DEPRECATION_WARNINGS |
| 56 | 56 | #endif |
| 57 | 57 | frame->time_base = (AVRational){ 0, 1 }; |
| 58 | − frame->key_frame = 1; | |
| 59 | 58 | frame->sample_aspect_ratio = (AVRational){ 0, 1 }; |
| 60 | 59 | frame->format = -1; /* unknown */ |
| 61 | 60 | frame->extended_data = frame->data; |
| @@ -265,7 +264,11 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) · 203 unmodified lines | ||
| 265 | 264 | { |
| 266 | 265 | int ret; |
| 267 | 266 | |
| 267 | +#if FF_API_FRAME_KEY | |
| 268 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 268 | 269 | dst->key_frame = src->key_frame; |
| 270 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 271 | +#endif | |
| 269 | 272 | dst->pict_type = src->pict_type; |
| 270 | 273 | dst->sample_aspect_ratio = src->sample_aspect_ratio; |
| 271 | 274 | dst->crop_top = src->crop_top; |
| @@ -416,10 +416,15 @@ typedef struct AVFrame { · 415 unmodified lines | ||
| 416 | 416 | */ |
| 417 | 417 | int format; |
| 418 | 418 | |
| 419 | +#if FF_API_FRAME_KEY | |
| 419 | 420 | /** |
| 420 | 421 | * 1 -> keyframe, 0-> not |
| 422 | + * | |
| 423 | + * @deprecated Use AV_FRAME_FLAG_KEY instead | |
| 421 | 424 | */ |
| 425 | + attribute_deprecated | |
| 422 | 426 | int key_frame; |
| 427 | +#endif | |
| 423 | 428 | |
| 424 | 429 | /** |
| 425 | 430 | * Picture type of the frame. |
| @@ -116,6 +116,7 @@ · 115 unmodified lines | ||
| 116 | 116 | #define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59) |
| 117 | 117 | #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) |
| 118 | 118 | #define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 59) |
| 119 | +#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59) | |
| 119 | 120 | |
| 120 | 121 | /** |
| 121 | 122 | * @} |