Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:33:31 +0000 (02:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:37:43 +0000 (02:37 +0200)
commit42c70b358418cb0a364f9b12954b93d6d29be7fb
tree6452b40c7720ed42fe6c44d550f949ff79fcd828
parent5e5ef6e8aecd299e4550e6c59ae5ce8db27358de
parentdd7fc37c71955b78a2687f29e871f714d18de386
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>
doc/filters.texi
libavfilter/af_join.c
libavfilter/avfilter.c