Merge commit 'c43a7ecad997fc527af34b952334f3d030709a1b'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2013-04-11 10:25:42 +02:00

parent ef29a95a4d c43a7ecad9

commit 31428240ec

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available