[FFmpeg-cvslog] Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 10:25:42 2013 +0200| [31428240ec1ee163424822bb0a1042bd70182da2] | committer: Michael Niedermayer

Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31428240ec1ee163424822bb0a1042bd70182da2
---