Merge remote-tracking branch 'richardpl/framestep'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:23:01 +0000 (02:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 00:31:14 +0000 (02:31 +0200)
commit5e5ef6e8aecd299e4550e6c59ae5ce8db27358de
tree4d1fd8ab7f142ddf5f579f3576a13f1e9a560e2a
parentf17651bd160d28d3a34c08c7aa537ef86defcc94
parent7c79ec66b6cc25a150d33d7397c8f4310b77e70f
Merge remote-tracking branch 'richardpl/framestep'

* richardpl/framestep:
  lavfi/framestep: remove request_frame hack
  lavfi/framestep: switch to an AVOptions-based system

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