diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:33:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:37:43 +0200 |
| commit | 42c70b358418cb0a364f9b12954b93d6d29be7fb (patch) | |
| tree | 6452b40c7720ed42fe6c44d550f949ff79fcd828 /common.mak | |
| parent | 5e5ef6e8aecd299e4550e6c59ae5ce8db27358de (diff) | |
| parent | dd7fc37c71955b78a2687f29e871f714d18de386 (diff) | |
| download | ffmpeg-42c70b358418cb0a364f9b12954b93d6d29be7fb.tar.gz | |
Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
af_join: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_join.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions