Commit Graph

12 Commits

Author SHA1 Message Date
Víctor Paesa dd93315340 Re-Add support for PNG or PNM as watermark images, which was broken
since the move to image2 API
Patch by Victor Paesa <wzrlpy@arsystel.com>
Original thread:
Date: Aug 13, 2006 9:18 AM
Subject: [Ffmpeg-devel] [PATCH] Attempt image2 in watermark vhook

Originally committed as revision 6129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-30 14:11:27 +00:00
Michael Niedermayer b4902c11c1 av_free* cleanup
Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-18 08:05:24 +00:00
Stefan Huehner 7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Marcus Engene ed818e25f8 Watermarking with exact colors.
Patch by Marcus Engene <hisfirstname(at)hislastname.se>

Originally committed as revision 5131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-09 14:39:29 +00:00
Dieter a851b8e898 add missing #includes
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30 23:32:14 +00:00
Diego Biurrun 5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun 115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Marcus Engene f368375cef FreeBSD support as well as some assorted fixes
patch by the author, Marcus Engene < ffmpeg __ at __ engene __ dot __ se >

Originally committed as revision 4665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-26 20:16:57 +00:00
Mike Melanson a2cfc4d630 this file got skipped during the API update
Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-18 16:43:14 +00:00
Marcus Engene ded78ac086 vhook watermark patch by (Marcus Engene: ffmpeg, engene se)
Originally committed as revision 4309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 09:18:38 +00:00
Michael Niedermayer c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer 21754ce65c watermark filter by (Marcus Engene <ffmpeg engene se>)
Originally committed as revision 3983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25 22:22:20 +00:00