diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-13 08:26:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 11:54:39 +0200 |
| commit | d69a4177b988cadaaadcd349f4b5dc1abe784a2d (patch) | |
| tree | d1294b2add7a81ef6413756e2cc84b330ba8a891 /libavfilter/avfilter.c | |
| parent | 491d261adecec619a3c7b92249133fb3ef0f5044 (diff) | |
| download | ffmpeg-streaming-d69a4177b988cadaaadcd349f4b5dc1abe784a2d.zip ffmpeg-streaming-d69a4177b988cadaaadcd349f4b5dc1abe784a2d.tar.gz | |
lavfi: remove now unused args parameter from AVFilter.init
Conflicts:
libavfilter/avfilter.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vsrc_color.c
libavfilter/vsrc_movie.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 871ab49..a1b0a1d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -838,9 +838,9 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque } if (filter->filter->init_opaque) - ret = filter->filter->init_opaque(filter, args, opaque); + ret = filter->filter->init_opaque(filter, opaque); else if (filter->filter->init) - ret = filter->filter->init(filter, args); + ret = filter->filter->init(filter); else if (filter->filter->init_dict) ret = filter->filter->init_dict(filter, &options); if (ret < 0) |
