[FFmpeg-cvslog] avfilter: Remove init_opaque callback
Andreas Rheinhardt
git at videolan.org
Mon Aug 16 19:19:03 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Aug 12 02:31:39 2021 +0200| [7b0e63b7d5628d8a7af8d4a05932815e4a43a01c] | committer: Andreas Rheinhardt
avfilter: Remove init_opaque callback
The last init_opaque callback has been removed in commit
07ffdedf784e86b88074d8d3e08e55752869562a; the opaque argument has been
always NULL since 0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5.
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b0e63b7d5628d8a7af8d4a05932815e4a43a01c
---
libavfilter/avfilter.c | 4 +---
libavfilter/avfilter.h | 7 -------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index f9d7226386..843b5947e5 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -877,9 +877,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.
*
More information about the ffmpeg-cvslog
mailing list