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.

Anton Khirnov committed 14 years ago

Commit a5e8c411 parent fbcaceb44 files · +57 −60Browse files

Unified · Split

44 files

libavfilter/af_aformat.c +1 −1
libavfilter/af_amix.c +1 −1
libavfilter/af_asyncts.c +1 −1
libavfilter/af_channelmap.c +1 −2
libavfilter/af_channelsplit.c +1 −1
libavfilter/af_join.c +1 −1
libavfilter/asrc_anullsrc.c +1 −1
libavfilter/avfilter.c +1 −1
libavfilter/avfilter.h +1 −3
libavfilter/buffersrc.c +2 −2
libavfilter/fifo.c +1 −1
libavfilter/split.c +1 −1
libavfilter/vf_aspect.c +1 −1
libavfilter/vf_blackframe.c +1 −1
libavfilter/vf_boxblur.c +1 −1
libavfilter/vf_crop.c +1 −1
libavfilter/vf_cropdetect.c +1 −1
libavfilter/vf_delogo.c +1 −1
libavfilter/vf_drawbox.c +1 −1
libavfilter/vf_drawtext.c +1 −1
libavfilter/vf_fade.c +1 −1
libavfilter/vf_fieldorder.c +1 −1
libavfilter/vf_format.c +1 −1
libavfilter/vf_fps.c +1 −1
libavfilter/vf_frei0r.c +2 −2
libavfilter/vf_gradfun.c +1 −1
libavfilter/vf_hqdn3d.c +1 −1
libavfilter/vf_libopencv.c +6 −6
libavfilter/vf_lut.c +3 −3
libavfilter/vf_overlay.c +1 −1
libavfilter/vf_pad.c +1 −1
libavfilter/vf_scale.c +1 −1
libavfilter/vf_select.c +1 −1
libavfilter/vf_setpts.c +1 −1
libavfilter/vf_settb.c +1 −1
libavfilter/vf_showinfo.c +1 −1
libavfilter/vf_slicify.c +1 −1
libavfilter/vf_transpose.c +1 −1
libavfilter/vf_unsharp.c +1 −1
libavfilter/vf_yadif.c +1 −1
libavfilter/vsrc_color.c +1 −1
libavfilter/vsrc_movie.c +1 −1
libavfilter/vsrc_nullsrc.c +1 −1
libavfilter/vsrc_testsrc.c +5 −5

libavfilter/af_aformat.c+1−1

@@ -86,7 +86,7 @@ static int get_sample_rate(const char *samplerate) · 85 unmodified lines
86	return FFMAX(ret, 0);	86	return FFMAX(ret, 0);
87	}	87	}
88		88
89	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	89	static av_cold int init(AVFilterContext ctx, const char args)
90	{	90	{
91	AFormatContext *s = ctx->priv;	91	AFormatContext *s = ctx->priv;
92	int ret;	92	int ret;

libavfilter/af_amix.c+1−1

@@ -479,7 +479,7 @@ static void filter_samples(AVFilterLink inlink, AVFilterBufferRef buf) · 478 unmodified lines
479	avfilter_unref_buffer(buf);	479	avfilter_unref_buffer(buf);
480	}	480	}
481		481
482	static int init(AVFilterContext ctx, const char args, void *opaque)	482	static int init(AVFilterContext ctx, const char args)
483	{	483	{
484	MixContext *s = ctx->priv;	484	MixContext *s = ctx->priv;
485	int i, ret;	485	int i, ret;

libavfilter/af_asyncts.c+1−1

@@ -56,7 +56,7 @@ static const AVClass async_class = { · 55 unmodified lines
56	.version = LIBAVUTIL_VERSION_INT,	56	.version = LIBAVUTIL_VERSION_INT,
57	};	57	};
58		58
59	static int init(AVFilterContext ctx, const char args, void *opaque)	59	static int init(AVFilterContext ctx, const char args)
60	{	60	{
61	ASyncContext *s = ctx->priv;	61	ASyncContext *s = ctx->priv;
62	int ret;	62	int ret;

libavfilter/af_channelmap.c+1−2

@@ -118,8 +118,7 @@ static int get_channel(char *map, uint64_t ch, char delim) · 117 unmodified lines
118	return 0;	118	return 0;
119	}	119	}
120		120
121	static av_cold int channelmap_init(AVFilterContext ctx, const char args,	121	static av_cold int channelmap_init(AVFilterContext ctx, const char args)
122	void *opaque)
123	{	122	{
124	ChannelMapContext *s = ctx->priv;	123	ChannelMapContext *s = ctx->priv;
125	int ret;	124	int ret;

libavfilter/af_channelsplit.c+1−1

@@ -52,7 +52,7 @@ static const AVClass channelsplit_class = { · 51 unmodified lines
52	.version = LIBAVUTIL_VERSION_INT,	52	.version = LIBAVUTIL_VERSION_INT,
53	};	53	};
54		54
55	static int init(AVFilterContext ctx, const char arg, void *opaque)	55	static int init(AVFilterContext ctx, const char arg)
56	{	56	{
57	ChannelSplitContext *s = ctx->priv;	57	ChannelSplitContext *s = ctx->priv;
58	int nb_channels;	58	int nb_channels;

libavfilter/af_join.c+1−1

@@ -184,7 +184,7 @@ static int parse_maps(AVFilterContext *ctx) · 183 unmodified lines
184	return 0;	184	return 0;
185	}	185	}
186		186
187	static int join_init(AVFilterContext ctx, const char args, void *opaque)	187	static int join_init(AVFilterContext ctx, const char args)
188	{	188	{
189	JoinContext *s = ctx->priv;	189	JoinContext *s = ctx->priv;
190	int ret, i;	190	int ret, i;

libavfilter/asrc_anullsrc.c+1−1

@@ -30,7 +30,7 @@ typedef struct { · 29 unmodified lines
30	int64_t sample_rate;	30	int64_t sample_rate;
31	} ANullContext;	31	} ANullContext;
32		32
33	static int init(AVFilterContext ctx, const char args, void *opaque)	33	static int init(AVFilterContext ctx, const char args)
34	{	34	{
35	ANullContext *priv = ctx->priv;	35	ANullContext *priv = ctx->priv;
36	char channel_layout_str[128] = "";	36	char channel_layout_str[128] = "";

libavfilter/avfilter.c+1−1

@@ -429,7 +429,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 428 unmodified lines
429	int ret=0;	429	int ret=0;
430		430
431	if (filter->filter->init)	431	if (filter->filter->init)
432	ret = filter->filter->init(filter, args, opaque);	432	ret = filter->filter->init(filter, args);
433	return ret;	433	return ret;
434	}	434	}
435		435

libavfilter/avfilter.h+1−3

     /**
      * 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

libavfilter/buffersrc.c+2−2

@@ -173,7 +173,7 @@ int av_buffersrc_buffer(AVFilterContext s, AVFilterBufferRef buf) · 172 unmodified lines
173	return 0;	173	return 0;
174	}	174	}
175		175
176	static av_cold int init_video(AVFilterContext ctx, const char args, void *opaque)	176	static av_cold int init_video(AVFilterContext ctx, const char args)
177	{	177	{
178	BufferSourceContext *c = ctx->priv;	178	BufferSourceContext *c = ctx->priv;
179	char pix_fmt_str[128];	179	char pix_fmt_str[128];
@@ -219,7 +219,7 @@ static const AVClass abuffer_class = { · 39 unmodified lines
219	.version = LIBAVUTIL_VERSION_INT,	219	.version = LIBAVUTIL_VERSION_INT,
220	};	220	};
221		221
222	static av_cold int init_audio(AVFilterContext ctx, const char args, void *opaque)	222	static av_cold int init_audio(AVFilterContext ctx, const char args)
223	{	223	{
224	BufferSourceContext *s = ctx->priv;	224	BufferSourceContext *s = ctx->priv;
225	int ret = 0;	225	int ret = 0;

libavfilter/fifo.c+1−1

@@ -50,7 +50,7 @@ typedef struct { · 49 unmodified lines
50	int allocated_samples; ///< number of samples buf_out was allocated for	50	int allocated_samples; ///< number of samples buf_out was allocated for
51	} FifoContext;	51	} FifoContext;
52		52
53	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	53	static av_cold int init(AVFilterContext ctx, const char args)
54	{	54	{
55	FifoContext *fifo = ctx->priv;	55	FifoContext *fifo = ctx->priv;
56	fifo->last = &fifo->root;	56	fifo->last = &fifo->root;

libavfilter/split.c+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	#include "internal.h"	28	#include "internal.h"
29	#include "video.h"	29	#include "video.h"
30		30
31	static int split_init(AVFilterContext ctx, const char args, void *opaque)	31	static int split_init(AVFilterContext ctx, const char args)
32	{	32	{
33	int i, nb_outputs = 2;	33	int i, nb_outputs = 2;
34		34

libavfilter/vf_aspect.c+1−1

@@ -32,7 +32,7 @@ typedef struct { · 31 unmodified lines
32	AVRational aspect;	32	AVRational aspect;
33	} AspectContext;	33	} AspectContext;
34		34
35	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	35	static av_cold int init(AVFilterContext ctx, const char args)
36	{	36	{
37	AspectContext *aspect = ctx->priv;	37	AspectContext *aspect = ctx->priv;
38	double ratio;	38	double ratio;

libavfilter/vf_blackframe.c+1−1

@@ -51,7 +51,7 @@ static int query_formats(AVFilterContext *ctx) · 50 unmodified lines
51	return 0;	51	return 0;
52	}	52	}
53		53
54	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	54	static av_cold int init(AVFilterContext ctx, const char args)
55	{	55	{
56	BlackFrameContext *blackframe = ctx->priv;	56	BlackFrameContext *blackframe = ctx->priv;
57		57

libavfilter/vf_boxblur.c+1−1

@@ -77,7 +77,7 @@ typedef struct { · 76 unmodified lines
77	#define V 2	77	#define V 2
78	#define A 3	78	#define A 3
79		79
80	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	80	static av_cold int init(AVFilterContext ctx, const char args)
81	{	81	{
82	BoxBlurContext *boxblur = ctx->priv;	82	BoxBlurContext *boxblur = ctx->priv;
83	int e;	83	int e;

libavfilter/vf_crop.c+1−1

@@ -113,7 +113,7 @@ static int query_formats(AVFilterContext *ctx) · 112 unmodified lines
113	return 0;	113	return 0;
114	}	114	}
115		115
116	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	116	static av_cold int init(AVFilterContext ctx, const char args)
117	{	117	{
118	CropContext *crop = ctx->priv;	118	CropContext *crop = ctx->priv;
119		119

libavfilter/vf_cropdetect.c+1−1

@@ -80,7 +80,7 @@ static int checkline(void ctx, const unsigned char src, int stride, int len, i · 79 unmodified lines
80	return total;	80	return total;
81	}	81	}
82		82
83	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	83	static av_cold int init(AVFilterContext ctx, const char args)
84	{	84	{
85	CropDetectContext *cd = ctx->priv;	85	CropDetectContext *cd = ctx->priv;
86		86

libavfilter/vf_delogo.c+1−1

@@ -171,7 +171,7 @@ static int query_formats(AVFilterContext *ctx) · 170 unmodified lines
171	return 0;	171	return 0;
172	}	172	}
173		173
174	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	174	static av_cold int init(AVFilterContext ctx, const char args)
175	{	175	{
176	DelogoContext *delogo = ctx->priv;	176	DelogoContext *delogo = ctx->priv;
177	int ret = 0;	177	int ret = 0;

libavfilter/vf_drawbox.c+1−1

@@ -40,7 +40,7 @@ typedef struct { · 39 unmodified lines
40	int vsub, hsub; ///< chroma subsampling	40	int vsub, hsub; ///< chroma subsampling
41	} DrawBoxContext;	41	} DrawBoxContext;
42		42
43	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	43	static av_cold int init(AVFilterContext ctx, const char args)
44	{	44	{
45	DrawBoxContext *drawbox= ctx->priv;	45	DrawBoxContext *drawbox= ctx->priv;
46	char color_str[1024] = "black";	46	char color_str[1024] = "black";

libavfilter/vf_drawtext.c+1−1

@@ -280,7 +280,7 @@ error: · 279 unmodified lines
280	return ret;	280	return ret;
281	}	281	}
282		282
283	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	283	static av_cold int init(AVFilterContext ctx, const char args)
284	{	284	{
285	int err;	285	int err;
286	DrawTextContext *dtext = ctx->priv;	286	DrawTextContext *dtext = ctx->priv;

libavfilter/vf_fade.c+1−1

@@ -37,7 +37,7 @@ typedef struct { · 36 unmodified lines
37	int hsub, vsub, bpp;	37	int hsub, vsub, bpp;
38	} FadeContext;	38	} FadeContext;
39		39
40	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	40	static av_cold int init(AVFilterContext ctx, const char args)
41	{	41	{
42	FadeContext *fade = ctx->priv;	42	FadeContext *fade = ctx->priv;
43	unsigned int nb_frames;	43	unsigned int nb_frames;

libavfilter/vf_fieldorder.c+1−1

@@ -38,7 +38,7 @@ typedef struct · 37 unmodified lines
38	int line_size[4]; ///< bytes of pixel data per line for each plane	38	int line_size[4]; ///< bytes of pixel data per line for each plane
39	} FieldOrderContext;	39	} FieldOrderContext;
40		40
41	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	41	static av_cold int init(AVFilterContext ctx, const char args)
42	{	42	{
43	FieldOrderContext *fieldorder = ctx->priv;	43	FieldOrderContext *fieldorder = ctx->priv;
44		44

libavfilter/vf_format.c+1−1

@@ -39,7 +39,7 @@ typedef struct { · 38 unmodified lines
39		39
40	#define PIX_FMT_NAME_MAXSIZE 32	40	#define PIX_FMT_NAME_MAXSIZE 32
41		41
42	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	42	static av_cold int init(AVFilterContext ctx, const char args)
43	{	43	{
44	FormatContext *format = ctx->priv;	44	FormatContext *format = ctx->priv;
45	const char cur, sep;	45	const char cur, sep;

libavfilter/vf_fps.c+1−1

@@ -63,7 +63,7 @@ static const AVClass class = { · 62 unmodified lines
63	.version = LIBAVUTIL_VERSION_INT,	63	.version = LIBAVUTIL_VERSION_INT,
64	};	64	};
65		65
66	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	66	static av_cold int init(AVFilterContext ctx, const char args)
67	{	67	{
68	FPSContext *s = ctx->priv;	68	FPSContext *s = ctx->priv;
69	int ret;	69	int ret;

libavfilter/vf_frei0r.c+2−2

@@ -278,7 +278,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx, · 277 unmodified lines
278	return 0;	278	return 0;
279	}	279	}
280		280
281	static av_cold int filter_init(AVFilterContext ctx, const char args, void *opaque)	281	static av_cold int filter_init(AVFilterContext ctx, const char args)
282	{	282	{
283	Frei0rContext *frei0r = ctx->priv;	283	Frei0rContext *frei0r = ctx->priv;
284	char dl_name[1024], c;	284	char dl_name[1024], c;
@@ -381,7 +381,7 @@ AVFilter avfilter_vf_frei0r = { · 96 unmodified lines
381	{ .name = NULL}},	381	{ .name = NULL}},
382	};	382	};
383		383
384	static av_cold int source_init(AVFilterContext ctx, const char args, void *opaque)	384	static av_cold int source_init(AVFilterContext ctx, const char args)
385	{	385	{
386	Frei0rContext *frei0r = ctx->priv;	386	Frei0rContext *frei0r = ctx->priv;
387	char dl_name[1024], c;	387	char dl_name[1024], c;

libavfilter/vf_gradfun.c+1−1

@@ -118,7 +118,7 @@ static void filter(GradFunContext ctx, uint8_t dst, uint8_t *src, int width, i · 117 unmodified lines
118	}	118	}
119	}	119	}
120		120
121	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	121	static av_cold int init(AVFilterContext ctx, const char args)
122	{	122	{
123	GradFunContext *gf = ctx->priv;	123	GradFunContext *gf = ctx->priv;
124	float thresh = 1.2;	124	float thresh = 1.2;

libavfilter/vf_hqdn3d.c+1−1

@@ -197,7 +197,7 @@ static void PrecalcCoefs(int *Ct, double Dist25) · 196 unmodified lines
197	#define PARAM2_DEFAULT 3.0	197	#define PARAM2_DEFAULT 3.0
198	#define PARAM3_DEFAULT 6.0	198	#define PARAM3_DEFAULT 6.0
199		199
200	static int init(AVFilterContext ctx, const char args, void *opaque)	200	static int init(AVFilterContext ctx, const char args)
201	{	201	{
202	HQDN3DContext *hqdn3d = ctx->priv;	202	HQDN3DContext *hqdn3d = ctx->priv;
203	double LumSpac, LumTmp, ChromSpac, ChromTmp;	203	double LumSpac, LumTmp, ChromSpac, ChromTmp;

libavfilter/vf_libopencv.c+6−6

@@ -71,7 +71,7 @@ static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { } · 70 unmodified lines
71		71
72	typedef struct {	72	typedef struct {
73	const char *name;	73	const char *name;
74	int (init)(AVFilterContext ctx, const char args, void opaque);	74	int (init)(AVFilterContext ctx, const char *args);
75	void (uninit)(AVFilterContext ctx);	75	void (uninit)(AVFilterContext ctx);
76	void (end_frame_filter)(AVFilterContext ctx, IplImage inimg, IplImage outimg);	76	void (end_frame_filter)(AVFilterContext ctx, IplImage inimg, IplImage outimg);
77	void *priv;	77	void *priv;
@@ -83,7 +83,7 @@ typedef struct { · 5 unmodified lines
83	double param3, param4;	83	double param3, param4;
84	} SmoothContext;	84	} SmoothContext;
85		85
86	static av_cold int smooth_init(AVFilterContext ctx, const char args, void *opaque)	86	static av_cold int smooth_init(AVFilterContext ctx, const char args)
87	{	87	{
88	OCVContext *ocv = ctx->priv;	88	OCVContext *ocv = ctx->priv;
89	SmoothContext *smooth = ocv->priv;	89	SmoothContext *smooth = ocv->priv;
@@ -249,7 +249,7 @@ typedef struct { · 159 unmodified lines
249	IplConvKernel *kernel;	249	IplConvKernel *kernel;
250	} DilateContext;	250	} DilateContext;
251		251
252	static av_cold int dilate_init(AVFilterContext ctx, const char args, void *opaque)	252	static av_cold int dilate_init(AVFilterContext ctx, const char args)
253	{	253	{
254	OCVContext *ocv = ctx->priv;	254	OCVContext *ocv = ctx->priv;
255	DilateContext *dilate = ocv->priv;	255	DilateContext *dilate = ocv->priv;
@@ -303,7 +303,7 @@ static void erode_end_frame_filter(AVFilterContext ctx, IplImage inimg, IplIma · 47 unmodified lines
303	typedef struct {	303	typedef struct {
304	const char *name;	304	const char *name;
305	size_t priv_size;	305	size_t priv_size;
306	int (init)(AVFilterContext ctx, const char args, void opaque);	306	int (init)(AVFilterContext ctx, const char *args);
307	void (uninit)(AVFilterContext ctx);	307	void (uninit)(AVFilterContext ctx);
308	void (end_frame_filter)(AVFilterContext ctx, IplImage inimg, IplImage outimg);	308	void (end_frame_filter)(AVFilterContext ctx, IplImage inimg, IplImage outimg);
309	} OCVFilterEntry;	309	} OCVFilterEntry;
@@ -314,7 +314,7 @@ static OCVFilterEntry ocv_filter_entries[] = { · 4 unmodified lines
314	{ "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter },	314	{ "smooth", sizeof(SmoothContext), smooth_init, NULL, smooth_end_frame_filter },
315	};	315	};
316		316
317	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	317	static av_cold int init(AVFilterContext ctx, const char args)
318	{	318	{
319	OCVContext *ocv = ctx->priv;	319	OCVContext *ocv = ctx->priv;
320	char name[128], priv_args[1024];	320	char name[128], priv_args[1024];
@@ -333,7 +333,7 @@ static av_cold int init(AVFilterContext ctx, const char args, void *opaque) · 12 unmodified lines
333		333
334	if (!(ocv->priv = av_mallocz(entry->priv_size)))	334	if (!(ocv->priv = av_mallocz(entry->priv_size)))
335	return AVERROR(ENOMEM);	335	return AVERROR(ENOMEM);
336	return ocv->init(ctx, priv_args, opaque);	336	return ocv->init(ctx, priv_args);
337	}	337	}
338	}	338	}
339		339

libavfilter/vf_lut.c+3−3

@@ -110,7 +110,7 @@ static const AVClass lut_class = { · 109 unmodified lines
110	lut_options	110	lut_options
111	};	111	};
112		112
113	static int init(AVFilterContext ctx, const char args, void *opaque)	113	static int init(AVFilterContext ctx, const char args)
114	{	114	{
115	LutContext *lut = ctx->priv;	115	LutContext *lut = ctx->priv;
116	int ret;	116	int ret;
@@ -375,7 +375,7 @@ DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input vid · 258 unmodified lines
375		375
376	#if CONFIG_NEGATE_FILTER	376	#if CONFIG_NEGATE_FILTER
377		377
378	static int negate_init(AVFilterContext ctx, const char args, void *opaque)	378	static int negate_init(AVFilterContext ctx, const char args)
379	{	379	{
380	LutContext *lut = ctx->priv;	380	LutContext *lut = ctx->priv;
381	char lut_params[64];	381	char lut_params[64];
@@ -388,7 +388,7 @@ static int negate_init(AVFilterContext ctx, const char args, void *opaque) · 6 unmodified lines
388	snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s",	388	snprintf(lut_params, sizeof(lut_params), "c0=negval:c1=negval:c2=negval:a=%s",
389	lut->negate_alpha ? "negval" : "val");	389	lut->negate_alpha ? "negval" : "val");
390		390
391	return init(ctx, lut_params, opaque);	391	return init(ctx, lut_params);
392	}	392	}
393		393
394	DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init);	394	DEFINE_LUT_FILTER(negate, "Negate input video.", negate_init);

libavfilter/vf_overlay.c+1−1

@@ -71,7 +71,7 @@ typedef struct { · 70 unmodified lines
71	char x_expr[256], y_expr[256];	71	char x_expr[256], y_expr[256];
72	} OverlayContext;	72	} OverlayContext;
73		73
74	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	74	static av_cold int init(AVFilterContext ctx, const char args)
75	{	75	{
76	OverlayContext *over = ctx->priv;	76	OverlayContext *over = ctx->priv;
77		77

libavfilter/vf_pad.c+1−1

@@ -108,7 +108,7 @@ typedef struct { · 107 unmodified lines
108	int needs_copy;	108	int needs_copy;
109	} PadContext;	109	} PadContext;
110		110
111	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	111	static av_cold int init(AVFilterContext ctx, const char args)
112	{	112	{
113	PadContext *pad = ctx->priv;	113	PadContext *pad = ctx->priv;
114	char color_string[128] = "black";	114	char color_string[128] = "black";

libavfilter/vf_scale.c+1−1

@@ -83,7 +83,7 @@ typedef struct { · 82 unmodified lines
83	char h_expr[256]; ///< height expression string	83	char h_expr[256]; ///< height expression string
84	} ScaleContext;	84	} ScaleContext;
85		85
86	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	86	static av_cold int init(AVFilterContext ctx, const char args)
87	{	87	{
88	ScaleContext *scale = ctx->priv;	88	ScaleContext *scale = ctx->priv;
89	const char *p;	89	const char *p;

libavfilter/vf_select.c+1−1

@@ -122,7 +122,7 @@ typedef struct { · 121 unmodified lines
122	AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames	122	AVFifoBuffer *pending_frames; ///< FIFO buffer of video frames
123	} SelectContext;	123	} SelectContext;
124		124
125	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	125	static av_cold int init(AVFilterContext ctx, const char args)
126	{	126	{
127	SelectContext *select = ctx->priv;	127	SelectContext *select = ctx->priv;
128	int ret;	128	int ret;

libavfilter/vf_setpts.c+1−1

@@ -67,7 +67,7 @@ typedef struct { · 66 unmodified lines
67	double var_values[VAR_VARS_NB];	67	double var_values[VAR_VARS_NB];
68	} SetPTSContext;	68	} SetPTSContext;
69		69
70	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	70	static av_cold int init(AVFilterContext ctx, const char args)
71	{	71	{
72	SetPTSContext *setpts = ctx->priv;	72	SetPTSContext *setpts = ctx->priv;
73	int ret;	73	int ret;

libavfilter/vf_settb.c+1−1

@@ -54,7 +54,7 @@ typedef struct { · 53 unmodified lines
54	double var_values[VAR_VARS_NB];	54	double var_values[VAR_VARS_NB];
55	} SetTBContext;	55	} SetTBContext;
56		56
57	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	57	static av_cold int init(AVFilterContext ctx, const char args)
58	{	58	{
59	SetTBContext *settb = ctx->priv;	59	SetTBContext *settb = ctx->priv;
60	av_strlcpy(settb->tb_expr, "intb", sizeof(settb->tb_expr));	60	av_strlcpy(settb->tb_expr, "intb", sizeof(settb->tb_expr));

libavfilter/vf_showinfo.c+1−1

@@ -33,7 +33,7 @@ typedef struct { · 32 unmodified lines
33	unsigned int frame;	33	unsigned int frame;
34	} ShowInfoContext;	34	} ShowInfoContext;
35		35
36	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	36	static av_cold int init(AVFilterContext ctx, const char args)
37	{	37	{
38	ShowInfoContext *showinfo = ctx->priv;	38	ShowInfoContext *showinfo = ctx->priv;
39	showinfo->frame = 0;	39	showinfo->frame = 0;

libavfilter/vf_slicify.c+1−1

@@ -35,7 +35,7 @@ typedef struct { · 34 unmodified lines
35	int use_random_h; ///< enable the use of random slice height values	35	int use_random_h; ///< enable the use of random slice height values
36	} SliceContext;	36	} SliceContext;
37		37
38	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	38	static av_cold int init(AVFilterContext ctx, const char args)
39	{	39	{
40	SliceContext *slice = ctx->priv;	40	SliceContext *slice = ctx->priv;
41		41

libavfilter/vf_transpose.c+1−1

@@ -44,7 +44,7 @@ typedef struct { · 43 unmodified lines
44	int dir;	44	int dir;
45	} TransContext;	45	} TransContext;
46		46
47	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	47	static av_cold int init(AVFilterContext ctx, const char args)
48	{	48	{
49	TransContext *trans = ctx->priv;	49	TransContext *trans = ctx->priv;
50	trans->dir = 0;	50	trans->dir = 0;

libavfilter/vf_unsharp.c+1−1

@@ -132,7 +132,7 @@ static void set_filter_param(FilterParam *fp, int msize_x, int msize_y, double a · 131 unmodified lines
132	fp->halfscale = 1 << (fp->scalebits - 1);	132	fp->halfscale = 1 << (fp->scalebits - 1);
133	}	133	}
134		134
135	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	135	static av_cold int init(AVFilterContext ctx, const char args)
136	{	136	{
137	UnsharpContext *unsharp = ctx->priv;	137	UnsharpContext *unsharp = ctx->priv;
138	int lmsize_x = 5, cmsize_x = 5;	138	int lmsize_x = 5, cmsize_x = 5;

libavfilter/vf_yadif.c+1−1

@@ -394,7 +394,7 @@ static int query_formats(AVFilterContext *ctx) · 393 unmodified lines
394	return 0;	394	return 0;
395	}	395	}
396		396
397	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	397	static av_cold int init(AVFilterContext ctx, const char args)
398	{	398	{
399	YADIFContext *yadif = ctx->priv;	399	YADIFContext *yadif = ctx->priv;
400	int cpu_flags = av_get_cpu_flags();	400	int cpu_flags = av_get_cpu_flags();

libavfilter/vsrc_color.c+1−1

@@ -44,7 +44,7 @@ typedef struct { · 43 unmodified lines
44	uint64_t pts;	44	uint64_t pts;
45	} ColorContext;	45	} ColorContext;
46		46
47	static av_cold int color_init(AVFilterContext ctx, const char args, void *opaque)	47	static av_cold int color_init(AVFilterContext ctx, const char args)
48	{	48	{
49	ColorContext *color = ctx->priv;	49	ColorContext *color = ctx->priv;
50	char color_string[128] = "black";	50	char color_string[128] = "black";

libavfilter/vsrc_movie.c+1−1

@@ -162,7 +162,7 @@ static int movie_init(AVFilterContext *ctx) · 161 unmodified lines
162	return 0;	162	return 0;
163	}	163	}
164		164
165	static av_cold int init(AVFilterContext ctx, const char args, void *opaque)	165	static av_cold int init(AVFilterContext ctx, const char args)
166	{	166	{
167	MovieContext *movie = ctx->priv;	167	MovieContext *movie = ctx->priv;
168	int ret;	168	int ret;

libavfilter/vsrc_nullsrc.c+1−1

@@ -51,7 +51,7 @@ typedef struct { · 50 unmodified lines
51	double var_values[VAR_VARS_NB];	51	double var_values[VAR_VARS_NB];
52	} NullContext;	52	} NullContext;
53		53
54	static int init(AVFilterContext ctx, const char args, void *opaque)	54	static int init(AVFilterContext ctx, const char args)
55	{	55	{
56	NullContext *priv = ctx->priv;	56	NullContext *priv = ctx->priv;
57		57

libavfilter/vsrc_testsrc.c+5−5

@@ -70,7 +70,7 @@ static const AVOption testsrc_options[] = { · 69 unmodified lines
70	{ NULL },	70	{ NULL },
71	};	71	};
72		72
73	static av_cold int init_common(AVFilterContext ctx, const char args, void *opaque)	73	static av_cold int init_common(AVFilterContext ctx, const char args)
74	{	74	{
75	TestSourceContext *test = ctx->priv;	75	TestSourceContext *test = ctx->priv;
76	AVRational frame_rate_q;	76	AVRational frame_rate_q;
@@ -336,13 +336,13 @@ static void test_fill_picture(AVFilterContext ctx, AVFilterBufferRef picref) · 259 unmodified lines
336	}	336	}
337	}	337	}
338		338
339	static av_cold int test_init(AVFilterContext ctx, const char args, void *opaque)	339	static av_cold int test_init(AVFilterContext ctx, const char args)
340	{	340	{
341	TestSourceContext *test = ctx->priv;	341	TestSourceContext *test = ctx->priv;
342		342
343	test->class = &testsrc_class;	343	test->class = &testsrc_class;
344	test->fill_picture_fn = test_fill_picture;	344	test->fill_picture_fn = test_fill_picture;
345	return init_common(ctx, args, opaque);	345	return init_common(ctx, args);
346	}	346	}
347		347
348	static int test_query_formats(AVFilterContext *ctx)	348	static int test_query_formats(AVFilterContext *ctx)
@@ -442,13 +442,13 @@ static void rgbtest_fill_picture(AVFilterContext ctx, AVFilterBufferRef picref · 93 unmodified lines
442	}	442	}
443	}	443	}
444		444
445	static av_cold int rgbtest_init(AVFilterContext ctx, const char args, void *opaque)	445	static av_cold int rgbtest_init(AVFilterContext ctx, const char args)
446	{	446	{
447	TestSourceContext *test = ctx->priv;	447	TestSourceContext *test = ctx->priv;
448		448
449	test->class = &rgbtestsrc_class;	449	test->class = &rgbtestsrc_class;
450	test->fill_picture_fn = rgbtest_fill_picture;	450	test->fill_picture_fn = rgbtest_fill_picture;
451	return init_common(ctx, args, opaque);	451	return init_common(ctx, args);
452	}	452	}
453		453
454	static int rgbtest_query_formats(AVFilterContext *ctx)	454	static int rgbtest_query_formats(AVFilterContext *ctx)

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code