Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902' | Michael Niedermayer | 2013-05-01 |
| | | | | | | | | | | | | | | | | | * 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> | ||
* | lavfi: add an asetpts filter | Anton Khirnov | 2013-04-30 |