-
Michael Niedermayer authored
* commit 'b4729382': 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>
1cba7fa3