diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:25:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:25:42 +0200 |
| commit | 31428240ec1ee163424822bb0a1042bd70182da2 (patch) | |
| tree | 1069259a524aff4e11246a9965135a4a6ee340e4 | |
| parent | ef29a95a4d60febcc7f01fbebd9969d1c8793588 (diff) | |
| parent | c43a7ecad997fc527af34b952334f3d030709a1b (diff) | |
| download | ffmpeg-31428240ec1ee163424822bb0a1042bd70182da2.tar.gz | |
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@gmx.at>
0 files changed, 0 insertions, 0 deletions