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
Showing the changes to libavfilter/avfilter.c (1 of 30 files). Show all
Unified · Split
| @@ -838,9 +838,9 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 837 unmodified lines | |||
| 838 | } | 838 | } |
| 839 | 839 | ||
| 840 | if (filter->filter->init_opaque) | 840 | if (filter->filter->init_opaque) |
| 841 | ret = filter->filter->init_opaque(filter, args, opaque); | 841 | ret = filter->filter->init_opaque(filter, opaque); |
| 842 | else if (filter->filter->init) | 842 | else if (filter->filter->init) |
| 843 | ret = filter->filter->init(filter, args); | 843 | ret = filter->filter->init(filter); |
| 844 | else if (filter->filter->init_dict) | 844 | else if (filter->filter->init_dict) |
| 845 | ret = filter->filter->init_dict(filter, &options); | 845 | ret = filter->filter->init_dict(filter, &options); |
| 846 | if (ret < 0) | 846 | if (ret < 0) |