Message ID | AM7PR03MB666025EEAF1747AA5A3B98988FF79@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Superseded |
Headers | show |
Series | [FFmpeg-devel,1/3] avfilter/avfilter: Fix leaks upon filter creation error | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavfilter/vf_guided.c | 3 ++- > libavfilter/vf_program_opencl.c | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c > index 202a6a0586..e2bf08f5c3 100644 > --- a/libavfilter/vf_guided.c > +++ b/libavfilter/vf_guided.c > @@ -500,6 +500,7 @@ const AVFilter ff_vf_guided = { > .activate = activate, > .inputs = NULL, > .outputs = guided_outputs, > - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | > + AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, > .process_command = process_command, > }; > diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c > index 4b38baeb3c..3af1485d53 100644 > --- a/libavfilter/vf_program_opencl.c > +++ b/libavfilter/vf_program_opencl.c > @@ -367,6 +367,7 @@ const AVFilter ff_vf_program_opencl = { > .description = NULL_IF_CONFIG_SMALL("Filter video using an OpenCL program"), > .priv_size = sizeof(ProgramOpenCLContext), > .priv_class = &program_opencl_class, > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, > .preinit = &program_opencl_framesync_preinit, > .init = &program_opencl_init, > .uninit = &program_opencl_uninit, > @@ -420,6 +421,7 @@ const AVFilter ff_vsrc_openclsrc = { > .description = NULL_IF_CONFIG_SMALL("Generate video using an OpenCL program"), > .priv_size = sizeof(ProgramOpenCLContext), > .priv_class = &openclsrc_class, > + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, This part here is wrong, as the code where inpads are inserted can not be reached by it (it is a source filter after all). Will send an updated patch. > .init = &program_opencl_init, > .uninit = &program_opencl_uninit, > .query_formats = &ff_opencl_filter_query_formats, > - Andreas
diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 202a6a0586..e2bf08f5c3 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -500,6 +500,7 @@ const AVFilter ff_vf_guided = { .activate = activate, .inputs = NULL, .outputs = guided_outputs, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | + AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index 4b38baeb3c..3af1485d53 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -367,6 +367,7 @@ const AVFilter ff_vf_program_opencl = { .description = NULL_IF_CONFIG_SMALL("Filter video using an OpenCL program"), .priv_size = sizeof(ProgramOpenCLContext), .priv_class = &program_opencl_class, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, .preinit = &program_opencl_framesync_preinit, .init = &program_opencl_init, .uninit = &program_opencl_uninit, @@ -420,6 +421,7 @@ const AVFilter ff_vsrc_openclsrc = { .description = NULL_IF_CONFIG_SMALL("Generate video using an OpenCL program"), .priv_size = sizeof(ProgramOpenCLContext), .priv_class = &openclsrc_class, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, .init = &program_opencl_init, .uninit = &program_opencl_uninit, .query_formats = &ff_opencl_filter_query_formats,
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/vf_guided.c | 3 ++- libavfilter/vf_program_opencl.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)