Merge commit 'c43a7eca'
* commit 'c43a7eca': lavfi: remove now unused args parameter from AVFilter.init Conflicts: libavfilter/avfilter.c libavfilter/buffersrc.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_alphamerge.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c Not merged (yet) because there are still many filters that use the args parameter. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment