Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 23:39:15 +0000 (01:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 23:42:28 +0000 (01:42 +0200)
commitac217bda30a79177c8a47713b3db12dc9e9bd45b
tree79dedb63dc984965e81a5718a5a376313d75c7f4
parent314be1933e3a39abd6576184786703701ced4415
parentb2b25b0659fa047da6266d2ce165d43011136b30
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'

* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
  af_asyncts: switch to an AVOptions-based system.

Conflicts:
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_asyncts.c
libavfilter/avfilter.c