Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:25:42 +0000 (10:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:25:42 +0000 (10:25 +0200)
* commit 'c43a7ecad997fc527af34b952334f3d030709a1b':
  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>

Trivial merge