-
由 Michael Niedermayer 提交于
* commit 'dd7fc37c': af_join: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_join.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
42c70b35
* commit 'dd7fc37c': af_join: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_join.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>