summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
Commit message (Collapse)AuthorAge
* Do not include mathematics.h in avutil.hMans Rullgard2011-07-03
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Fix timestamp scaling in the overlay filter.Stefano Sabatini2010-11-25
| | | | | | | Compute the outpicref PTS in start_frame(), since it is required for comparing that value with the value of the overpicref. Originally committed as revision 25828 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Port overlay filter from the libavfilter repo (with many fixes),Stefano Sabatini2010-11-21
adopting Baptiste variant which is simpler and faster. Originally committed as revision 25784 to svn://svn.ffmpeg.org/ffmpeg/trunk