lavfi: remove 'opaque' parameter from AVFilter.init()

It is not used in any filters currently and is inherently evil. If
passing binary data to filters is required in the future, it should be
done with some AVOptions-based system.

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 5b00d7de9c71beafc5502773238efb6c5845d3cf..b3558016ec5e6ef07dc794c7fb7a90e6ceea3fda 100644 (file)
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -86,7 +86,7 @@ static int get_sample_rate(const char *samplerate)
     return FFMAX(ret, 0);
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     AFormatContext *s = ctx->priv;
     int ret;

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 4af5f80d57cbcaeb763154f8cb8e8c4723398988..156799c44a2abbb8d2cbb52bbc86323ce8a88d82 100644 (file)
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -479,7 +479,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
     avfilter_unref_buffer(buf);
 }
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     MixContext *s = ctx->priv;
     int i, ret;

diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 252b32278d7df24aabe20af8022cfd1780e0851c..8402b2670e1b915d4c07c01fdaa613697ec63b6a 100644 (file)
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -56,7 +56,7 @@ static const AVClass async_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     ASyncContext *s = ctx->priv;
     int ret;

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 14c2c0cb5a153a0c151f439b74f4e053c41a602b..0dfffaa036de122c4ac379f0c104b5a873677228 100644 (file)
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -118,8 +118,7 @@ static int get_channel(char **map, uint64_t *ch, char delim)
     return 0;
 }
 
-static av_cold int channelmap_init(AVFilterContext *ctx, const char *args,
-                                   void *opaque)
+static av_cold int channelmap_init(AVFilterContext *ctx, const char *args)
 {
     ChannelMapContext *s = ctx->priv;
     int ret;

diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index c9b31fa79140249d3c3dc8462765c58114822d77..ed134d288539670b34f4b42a10d9d9640f171908 100644 (file)
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -52,7 +52,7 @@ static const AVClass channelsplit_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static int init(AVFilterContext *ctx, const char *arg, void *opaque)
+static int init(AVFilterContext *ctx, const char *arg)
 {
     ChannelSplitContext *s = ctx->priv;
     int nb_channels;

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index ab5e9055b384958f664522fe11f9a530780b818a..89bc47fde1b90cf2f420e74a823b00377dfe5e9a 100644 (file)
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -184,7 +184,7 @@ static int parse_maps(AVFilterContext *ctx)
     return 0;
 }
 
-static int join_init(AVFilterContext *ctx, const char *args, void *opaque)
+static int join_init(AVFilterContext *ctx, const char *args)
 {
     JoinContext *s = ctx->priv;
     int ret, i;

diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 6f1c1e78a4b3f28558c0a58b32c7d1689e8dfef7..914952936f87a7ffbf9e6e0d86439ef51206e0ec 100644 (file)
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -30,7 +30,7 @@ typedef struct {
     int64_t sample_rate;
 } ANullContext;
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     ANullContext *priv = ctx->priv;
     char channel_layout_str[128] = "";

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index bf76997aae367d09c1d2fed762419fcfa02f9381..de059b7f15acf9a59f23e6e7c9b1c5372e69e7b4 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -429,7 +429,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
     int ret=0;
 
     if (filter->filter->init)
-        ret = filter->filter->init(filter, args, opaque);
+        ret = filter->filter->init(filter, args);
     return ret;
 }
 

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index f09f0869f42c664a006258a171e42e03b834501d..b3b32dd0f6435b538178669804552641196f6c6d 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -456,10 +456,8 @@ typedef struct AVFilter {
     /**
      * Filter initialization function. Args contains the user-supplied
      * parameters. FIXME: maybe an AVOption-based system would be better?
-     * opaque is data provided by the code requesting creation of the filter,
-     * and is used to pass data to the filter.
      */
-    int (*init)(AVFilterContext *ctx, const char *args, void *opaque);
+    int (*init)(AVFilterContext *ctx, const char *args);
 
     /**
      * Filter uninitialization function. Should deallocate any memory held

diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index ad9f45bd5d0cbf8fdac9d56719b9ebdf427c595b..30e34b75fa3cc3ebedcd156dc4ad000ea2e71d38 100644 (file)
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -173,7 +173,7 @@ int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf)
     return 0;
 }
 
-static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init_video(AVFilterContext *ctx, const char *args)
 {
     BufferSourceContext *c = ctx->priv;
     char pix_fmt_str[128];
@@ -219,7 +219,7 @@ static const AVClass abuffer_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init_audio(AVFilterContext *ctx, const char *args)
 {
     BufferSourceContext *s = ctx->priv;
     int ret = 0;

diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index 6d28757f4d0c05085677558fe2fefc4b108c9e18..40c3796bf90f563f17207661d881781b8c807d52 100644 (file)
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -50,7 +50,7 @@ typedef struct {
     int allocated_samples;      ///< number of samples buf_out was allocated for
 } FifoContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FifoContext *fifo = ctx->priv;
     fifo->last = &fifo->root;

diff --git a/libavfilter/split.c b/libavfilter/split.c
index b7d037804a9f7886e22b840f785f6383b88bdb0b..f1c4b9287dac0f993a640a3c83988632294c39c9 100644 (file)
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 #include "video.h"
 
-static int split_init(AVFilterContext *ctx, const char *args, void *opaque)
+static int split_init(AVFilterContext *ctx, const char *args)
 {
     int i, nb_outputs = 2;
 

diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 44bef91fbc267c7ef6a0f42269567ee2a37e9da7..65dc364ed83f1e049403540f190913d601c5a064 100644 (file)
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -32,7 +32,7 @@ typedef struct {
     AVRational aspect;
 } AspectContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     AspectContext *aspect = ctx->priv;
     double  ratio;

diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index a1f97328d005913a91a4356fb935274139553a01..59c5b30a36dd72ff3c28c32062d048d32df90335 100644 (file)
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -51,7 +51,7 @@ static int query_formats(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     BlackFrameContext *blackframe = ctx->priv;
 

diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c
index 06917ecf07828b7321a200d7e356811828a0f2c4..be4a8323b009a0362c7b2a3f782a83f4446d0385 100644 (file)
--- a/libavfilter/vf_boxblur.c
+++ b/libavfilter/vf_boxblur.c
@@ -77,7 +77,7 @@ typedef struct {
 #define V 2
 #define A 3
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     BoxBlurContext *boxblur = ctx->priv;
     int e;

diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index c884ce1f2ae5a6f7b37424fdacb083b88c368900..cf9a0a3b8d649590ccd6f23a581995beb935d43e 100644 (file)
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -113,7 +113,7 @@ static int query_formats(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     CropContext *crop = ctx->priv;
 

diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c
index c890dab5b9895754d11b7403d7e9ab3efe8e9f72..d4e6c40240ab20c2587c56ec9683d05a29378d19 100644 (file)
--- a/libavfilter/vf_cropdetect.c
+++ b/libavfilter/vf_cropdetect.c
@@ -80,7 +80,7 @@ static int checkline(void *ctx, const unsigned char *src, int stride, int len, i
     return total;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     CropDetectContext *cd = ctx->priv;
 

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 77382c99b5d241c93d6d9f0e0370f21711682684..c2487396d772d85e005551e299bbf60e22dedbda 100644 (file)
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -171,7 +171,7 @@ static int query_formats(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     DelogoContext *delogo = ctx->priv;
     int ret = 0;

diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index eb129a23d84fac8af61a1e6deca357ceb60a4a13..dc9c7183567490187c7bf4045bcca7697face92c 100644 (file)
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -40,7 +40,7 @@ typedef struct {
     int vsub, hsub;   ///< chroma subsampling
 } DrawBoxContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     DrawBoxContext *drawbox= ctx->priv;
     char color_str[1024] = "black";

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index db66ad618d3448f2f7826642042936939ae36f02..22a9480aba882822d66aceb10f5cc26cb91da00d 100644 (file)
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -280,7 +280,7 @@ error:
     return ret;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     int err;
     DrawTextContext *dtext = ctx->priv;

diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index 00501dd53c314c1ea82e74be03e3c91ee360bf19..988cb42200e0dcbab8d11ef54546920f9488b80d 100644 (file)
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -37,7 +37,7 @@ typedef struct {
     int hsub, vsub, bpp;
 } FadeContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FadeContext *fade = ctx->priv;
     unsigned int nb_frames;

diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index 89218560c6216270bd5ef1292c7ccb4b59b91b58..a9347fd632071dfa0127c5a8ba6eb76f9157e1e5 100644 (file)
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -38,7 +38,7 @@ typedef struct
     int          line_size[4]; ///< bytes of pixel data per line for each plane
 } FieldOrderContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FieldOrderContext *fieldorder = ctx->priv;
 

diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index 1a5011851957124c4896323a82a9880c3b756b83..b9251a19fc566aefac72403efce741d92524d3c2 100644 (file)
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@ -39,7 +39,7 @@ typedef struct {
 
 #define PIX_FMT_NAME_MAXSIZE 32
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FormatContext *format = ctx->priv;
     const char *cur, *sep;

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 18cd51a9a84a2fc177dc6ef26a7364c0626b6e7f..bcc6a69814303710e85e8cd13eb63e4c66a7ed44 100644 (file)
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -63,7 +63,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FPSContext *s = ctx->priv;
     int ret;

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 54881571af16bf50f49faf48058b188e54226a73..38cac274a10ec76e9248b233f67720c397a0b5b1 100644 (file)
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -278,7 +278,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
     return 0;
 }
 
-static av_cold int filter_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int filter_init(AVFilterContext *ctx, const char *args)
 {
     Frei0rContext *frei0r = ctx->priv;
     char dl_name[1024], c;
@@ -381,7 +381,7 @@ AVFilter avfilter_vf_frei0r = {
                                   { .name = NULL}},
 };
 
-static av_cold int source_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int source_init(AVFilterContext *ctx, const char *args)
 {
     Frei0rContext *frei0r = ctx->priv;
     char dl_name[1024], c;

diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 303e54c7f9d4db5fed454a33b019c188749e6c3b..24ebcd4cf5527e64de7a5bc1003e2d706a935d55 100644 (file)
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -118,7 +118,7 @@ static void filter(GradFunContext *ctx, uint8_t *dst, uint8_t *src, int width, i
     }
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     GradFunContext *gf = ctx->priv;
     float thresh = 1.2;

diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index f9b864e9eaabcfb8a6289754f214f05a8a466617..0b35f1124b497b47c0fa5f407ae1fe6ae9622881 100644 (file)
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -197,7 +197,7 @@ static void PrecalcCoefs(int *Ct, double Dist25)
 #define PARAM2_DEFAULT 3.0
 #define PARAM3_DEFAULT 6.0
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     HQDN3DContext *hqdn3d = ctx->priv;
     double LumSpac, LumTmp, ChromSpac, ChromTmp;

diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index d38b5845bd04fe7c0a7b953c56a3cfe78166d7a2..438b73b9b3861db31be28a5efd78210a07096cad 100644 (file)
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -71,7 +71,7 @@ static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { }
 
 typedef struct {
     const char *name;
-    int (*init)(AVFilterContext *ctx, const char *args, void *opaque);
+    int (*init)(AVFilterContext *ctx, const char *args);
     void (*uninit)(AVFilterContext *ctx);
     void (*end_frame_filter)(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg);
     void *priv;
@@ -83,7 +83,7 @@ typedef struct {
     double param3, param4;
 } SmoothContext;
 
-static av_cold int smooth_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int smooth_init(AVFilterContext *ctx, const char *args)
 {
     OCVContext *ocv = ctx->priv;
     SmoothContext *smooth = ocv->priv;
@@ -249,7 +249,7 @@ typedef struct {
     IplConvKernel *kernel;
 } DilateContext;
 
-static av_cold int dilate_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int dilate_init(AVFilterContext *ctx, const char *args)
 {
     OCVContext *ocv = ctx->priv;
     DilateContext *dilate = ocv->priv;
@@ -303,7 +303,7 @@ static void erode_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplIma
 typedef struct {
     const char *name;
     size_t priv_size;
-    int  (*init)(AVFilterContext *ctx, const char *args, void *opaque);
+    int  (*init)(AVFilterContext *ctx, const char *args);
     void (*uninit)(AVFilterContext *ctx);
     void (*end_frame_filter)(AVFilterContext *ctx, IplImage *inimg, IplImage *outimg);
 } OCVFilterEntry;
@@ -314,7 +314,7 @@ static OCVFilterEntry ocv_filter_entries[] = {
     { "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter },
 };
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     OCVContext *ocv = ctx->priv;
     char name[128], priv_args[1024];
@@ -333,7 +333,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
 
             if (!(ocv->priv = av_mallocz(entry->priv_size)))
                 return AVERROR(ENOMEM);
-            return ocv->init(ctx, priv_args, opaque);
+            return ocv->init(ctx, priv_args);
         }
     }
 

diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
index 38172289606ccccc2d886fbb211fb939c9eb9115..8e96ed3506628e9760ad526bb249792af6a21b99 100644 (file)
--- a/libavfilter/vf_lut.c
+++ b/libavfilter/vf_lut.c
@@ -110,7 +110,7 @@ static const AVClass lut_class = {
     lut_options
 };
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     LutContext *lut = ctx->priv;
     int ret;
@@ -375,7 +375,7 @@ DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input vid
 
 #if CONFIG_NEGATE_FILTER
 
-static int negate_init(AVFilterContext *ctx, const char *args, void *opaque)
+static int negate_init(AVFilterContext *ctx, const char *args)
 {
     LutContext *lut = ctx->priv;
     char lut_params[64];
@@ -388,7 +388,7 @@ static int negate_init(AVFilterContext *ctx, const char *args, void *opaque)
     snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s",
              lut->negate_alpha ? "negval" : "val");
 
-    return init(ctx, lut_params, opaque);
+    return init(ctx, lut_params);
 }
 
 DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init);

diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index ff7c348e52aca0ea258c216b14726366957fdba5..b42654435388aac0e177ecddc67b4da69f9b4e1d 100644 (file)
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -71,7 +71,7 @@ typedef struct {
     char x_expr[256], y_expr[256];
 } OverlayContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     OverlayContext *over = ctx->priv;
 

diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 098fc806c8d2b6c07c428ace071617922c95979e..db4e927a42fb37281dd1d8ddcc44489abdb9aba0 100644 (file)
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -108,7 +108,7 @@ typedef struct {
     int needs_copy;
 } PadContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     PadContext *pad = ctx->priv;
     char color_string[128] = "black";

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 58daf38376aae19c9d1eec30cbe87dda6399a0b8..4e51b4f9f542882622601071280c4a1b9a391c82 100644 (file)
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -83,7 +83,7 @@ typedef struct {
     char h_expr[256];           ///< height expression string
 } ScaleContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     ScaleContext *scale = ctx->priv;
     const char *p;

diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index dab47ced85b653845f8980e4586ef7f1ef512922..719885e4010856ee958e9046f5667b56d8cca90b 100644 (file)
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -122,7 +122,7 @@ typedef struct {
     AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames
 } SelectContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     SelectContext *select = ctx->priv;
     int ret;

diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
index 77eef606791a7c1c9efa87b08edeb84e4fcb8364..6f8290d93db58c7ccf2a46699ff8f77fca2515dd 100644 (file)
--- a/libavfilter/vf_setpts.c
+++ b/libavfilter/vf_setpts.c
@@ -67,7 +67,7 @@ typedef struct {
     double var_values[VAR_VARS_NB];
 } SetPTSContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     SetPTSContext *setpts = ctx->priv;
     int ret;

diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index 78d4617526ad2d7c28f69c8a986648d283c14769..7b23751fda09cd08b3e8110b7c828679f3fbd709 100644 (file)
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -54,7 +54,7 @@ typedef struct {
     double var_values[VAR_VARS_NB];
 } SetTBContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     SetTBContext *settb = ctx->priv;
     av_strlcpy(settb->tb_expr, "intb", sizeof(settb->tb_expr));

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index dbb67e91a2f62a904ae70290882f6ddda29f3a0f..b8053b58f9f2b902c3adc8fa0b2ed2a2aa3e6a98 100644 (file)
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -33,7 +33,7 @@ typedef struct {
     unsigned int frame;
 } ShowInfoContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     ShowInfoContext *showinfo = ctx->priv;
     showinfo->frame = 0;

diff --git a/libavfilter/vf_slicify.c b/libavfilter/vf_slicify.c
index 636912dbdc5b0c6572d0e4eae8a274cb6ea72b47..e256c4561b843430faa642e452bf753f1463af29 100644 (file)
--- a/libavfilter/vf_slicify.c
+++ b/libavfilter/vf_slicify.c
@@ -35,7 +35,7 @@ typedef struct {
     int use_random_h;   ///< enable the use of random slice height values
 } SliceContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     SliceContext *slice = ctx->priv;
 

diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 5bcee9d32e062c258764425b89b41d5f1fe8aeb6..7f8e025be078504231119ab928fd86b2090c81a7 100644 (file)
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -44,7 +44,7 @@ typedef struct {
     int dir;
 } TransContext;
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     TransContext *trans = ctx->priv;
     trans->dir = 0;

diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index 8010f2dc177c196b686c39e2ba0db564ca17e8be..1e9c0ee59f6dcbc5063934a4d5e9c40d07e47e51 100644 (file)
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -132,7 +132,7 @@ static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, double a
     fp->halfscale = 1 << (fp->scalebits - 1);
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     UnsharpContext *unsharp = ctx->priv;
     int lmsize_x = 5, cmsize_x = 5;

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index baf8b7aca44891019819444d04a6b50e0e704051..51b273e818133ce72607741ce1c0d921f0f3c470 100644 (file)
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -394,7 +394,7 @@ static int query_formats(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     YADIFContext *yadif = ctx->priv;
     int cpu_flags = av_get_cpu_flags();

diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
index de1f340b013ef0c9903ba4099f1c9ebfa3f03f04..1591d6546405b4bd039eb5071b4b0709bfb8dbb5 100644 (file)
--- a/libavfilter/vsrc_color.c
+++ b/libavfilter/vsrc_color.c
@@ -44,7 +44,7 @@ typedef struct {
     uint64_t pts;
 } ColorContext;
 
-static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int color_init(AVFilterContext *ctx, const char *args)
 {
     ColorContext *color = ctx->priv;
     char color_string[128] = "black";

diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 64f6e18301881afa0937a68312e23d4a30317bea..2b79d85aebd5b1d9a80d2fc1790be34569b4734d 100644 (file)
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -162,7 +162,7 @@ static int movie_init(AVFilterContext *ctx)
     return 0;
 }
 
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     MovieContext *movie = ctx->priv;
     int ret;

diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c
index 71094dc95b33b7bb5e05f09f3086170358fb64fb..97c56cc33f352a5cc6153e4e543a71be69592eec 100644 (file)
--- a/libavfilter/vsrc_nullsrc.c
+++ b/libavfilter/vsrc_nullsrc.c
@@ -51,7 +51,7 @@ typedef struct {
     double var_values[VAR_VARS_NB];
 } NullContext;
 
-static int init(AVFilterContext *ctx, const char *args, void *opaque)
+static int init(AVFilterContext *ctx, const char *args)
 {
     NullContext *priv = ctx->priv;
 

diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 36f18b621347f2103f50f6ac46729fc07f639e8b..c8e1aa61aab4b84bad433fca251ebb09d39731d9 100644 (file)
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -70,7 +70,7 @@ static const AVOption testsrc_options[] = {
     { NULL },
 };
 
-static av_cold int init_common(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init_common(AVFilterContext *ctx, const char *args)
 {
     TestSourceContext *test = ctx->priv;
     AVRational frame_rate_q;
@@ -336,13 +336,13 @@ static void test_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref)
     }
 }
 
-static av_cold int test_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int test_init(AVFilterContext *ctx, const char *args)
 {
     TestSourceContext *test = ctx->priv;
 
     test->class = &testsrc_class;
     test->fill_picture_fn = test_fill_picture;
-    return init_common(ctx, args, opaque);
+    return init_common(ctx, args);
 }
 
 static int test_query_formats(AVFilterContext *ctx)
@@ -442,13 +442,13 @@ static void rgbtest_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref
      }
 }
 
-static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args)
 {
     TestSourceContext *test = ctx->priv;
 
     test->class = &rgbtestsrc_class;
     test->fill_picture_fn = rgbtest_fill_picture;
-    return init_common(ctx, args, opaque);
+    return init_common(ctx, args);
 }
 
 static int rgbtest_query_formats(AVFilterContext *ctx)