| Message ID | PR3PR03MB666558EC7783E36C62FA08BF8FF99@PR3PR03MB6665.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 7b0e63b7d5628d8a7af8d4a05932815e4a43a01c |
| Headers | show |
| Series | [FFmpeg-devel,01/23] avfilter/vf_(guided|program_opencl): Add missing dynamic inputs flag | 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 (12021-08-12): > The last init_opaque callback has been removed in commit > 07ffdedf784e86b88074d8d3e08e55752869562a; the opaque argument has been > always NULL since 0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavfilter/avfilter.c | 4 +--- > libavfilter/avfilter.h | 7 ------- > 2 files changed, 1 insertion(+), 10 deletions(-) Should be ok. I do not maintain the other files, but the changes are straightforward and should be ok. Thanks.
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9ac247c251..385720df82 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -914,9 +914,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) } } - if (ctx->filter->init_opaque) - ret = ctx->filter->init_opaque(ctx, NULL); - else if (ctx->filter->init) + if (ctx->filter->init) ret = ctx->filter->init(ctx); else if (ctx->filter->init_dict) ret = ctx->filter->init_dict(ctx, options); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 360f63bc45..5a225ffc44 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -300,13 +300,6 @@ typedef struct AVFilter { */ int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags); - /** - * Filter initialization function, alternative to the init() - * callback. Args contains the user-supplied parameters, opaque is - * used for providing binary data. - */ - int (*init_opaque)(AVFilterContext *ctx, void *opaque); - /** * Filter activation function. *
The last init_opaque callback has been removed in commit 07ffdedf784e86b88074d8d3e08e55752869562a; the opaque argument has been always NULL since 0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/avfilter.c | 4 +--- libavfilter/avfilter.h | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-)