-
Michael Niedermayer authored
* commit 'b2b25b06': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ac217bda
* commit 'b2b25b06': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>