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.h (1 of 30 files). Show all
Unified · Split
| @@ -441,10 +441,10 @@ typedef struct AVFilter { · 440 unmodified lines | |||
| 441 | */ | 441 | */ |
| 442 | 442 | ||
| 443 | /** | 443 | /** |
| 444 | * Filter initialization function. Args contains the user-supplied | 444 | * Filter initialization function. Called when all the options have been |
| 445 | * parameters. FIXME: maybe an AVOption-based system would be better? | 445 | * set. |
| 446 | */ | 446 | */ |
| 447 | int (*init)(AVFilterContext *ctx, const char *args); | 447 | int (*init)(AVFilterContext *ctx); |
| 448 | 448 | ||
| 449 | /** | 449 | /** |
| 450 | * Should be set instead of init by the filters that want to pass a | 450 | * Should be set instead of init by the filters that want to pass a |