Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 08:59:21 +0000 (10:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 08:59:21 +0000 (10:59 +0200)
commit1cba7fa364a9c95773d779ff5d5602be8391310e
tree0b54487634827c984c861d025798d689e4e5b195
parent0061ba044a44517d7291b80427cdebc5a1470c69
parentb472938233b98178ed6c1353c37e0dc7ab585902
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'

* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
  lavfi: add an asetpts filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/Makefile
libavfilter/setpts.c
libavfilter/version.h