breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavfi/avfilter: export AVFilter initialization state

Browse Source 
This will allow the AVOption code to detect setting non-runtime options
after the filter has been initialized.
This commit is contained in:
Anton Khirnov
2024-09-28 16:19:06 +02:00
parent 0548ab2e42
commit 262e6f8430
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avfilter.c
View File

@@ -159,7 +159,8 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
src->outputs[srcpad] || dst->inputs[dstpad])
return AVERROR(EINVAL);
if (!fffilterctx(src)->initialized || !fffilterctx(dst)->initialized) {
if (!(fffilterctx(src)->state_flags & AV_CLASS_STATE_INITIALIZED) ||
!(fffilterctx(dst)->state_flags & AV_CLASS_STATE_INITIALIZED)) {
av_log(src, AV_LOG_ERROR, "Filters must be initialized before linking.\n");
return AVERROR(EINVAL);
}
@@ -676,6 +677,7 @@ static const AVClass avfilter_class = {
.child_next = filter_child_next,
.child_class_iterate = filter_child_class_iterate,
.option = avfilter_options,
.state_flags_offset = offsetof(FFFilterContext, state_flags),
};
static int default_execute(AVFilterContext *ctx, avfilter_action_func *func, void *arg,
@@ -909,7 +911,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
FFFilterContext *ctxi = fffilterctx(ctx);
int ret = 0;
if (ctxi->initialized) {
if (ctxi->state_flags & AV_CLASS_STATE_INITIALIZED) {
av_log(ctx, AV_LOG_ERROR, "Filter already initialized\n");
return AVERROR(EINVAL);
}
@@ -940,7 +942,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
return ret;
}
ctxi->initialized = 1;
ctxi->state_flags |= AV_CLASS_STATE_INITIALIZED;
return 0;
}