Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:48:26 +0000 (23:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 21:49:58 +0000 (23:49 +0200)
commitf42635a50b7af62b120c09e98dbd4a12f4d1e4b5
tree562ffbe8d57fdb4fdd7b5d9681eea61b55d81e47
parent270d3c96ec492e004275fdb7fd625f801fd1a26b
parent33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff
Merge commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff'

* commit '33b97faaba2744f0a2fd65c0ef9ecc2de3fad7ff':
  vf_setpts: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/f_setpts.c

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