Commit Graph

3 Commits

Author SHA1 Message Date
Reinhard Tartler 7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Stefano Sabatini 9b195435b3 Fix timestamp scaling in the overlay filter.
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
2010-11-25 21:22:55 +00:00
Stefano Sabatini 58935b25d0 Port overlay filter from the libavfilter repo (with many fixes),
adopting Baptiste variant which is simpler and faster.

Originally committed as revision 25784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 18:39:34 +00:00