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

Showing the changes to libavfilter (3 of 8 files). Show all

Unified · Split

3 files

@@ -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

         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;

Keyboard shortcuts