avutil/frame: deprecate key_frame

James Almer committed 3 years ago

Commit 3e06f6f1 parent c7a86819 files · +33 −1Browse files

Showing the changes to libavfilter (4 of 9 files). Show all

Unified · Split

4 files

libavfilter/buffersrc.c +4 −0
libavfilter/vf_coreimage.m +2 −0
libavfilter/vsrc_gradients.c +5 −0
libavfilter/vsrc_testsrc.c +4 −0

libavfilter/buffersrc.c+4−0

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

libavfilter/vf_coreimage.m+2−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;

libavfilter/vsrc_gradients.c+5−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

libavfilter/vsrc_testsrc.c+4−0

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