RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
52,857 Commits 36 Branches 393 Tags 217 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 1cba7fa364 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>
 2013-05-01 10:59:21 +02:00
Anton Khirnov b472938233 lavfi: add an asetpts filter 2013-04-30 11:17:57 +02:00