Commit 31428240 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ef29a95a c43a7eca
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment