aboutsummaryrefslogtreecommitdiff
path: root/vhook/watermark.c
AgeCommit message (Collapse)Author
2007-05-13Do not use return with argument for a function "returning" void.Reimar Döffinger
Originally committed as revision 9016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01Replace forbidden exit() by return() Víctor Paesa, wzrlpy arsystel com.Diego Biurrun
Originally committed as revision 8592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07Replace deprecated PIX_FMT names by the newer variants.Diego Biurrun
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22spelling/grammar fixesDiego Biurrun
Originally committed as revision 6757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11port watermark vhook to swscalerVíctor Paesa
Patch by Victor Paesa %wzrlpy A arsystel P com% Original thread + testcase: Date: Sep 12, 2006 5:29 PM Subject: Re: [Ffmpeg-devel] [PATCH] enable libswscale Originally committed as revision 6649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-30Re-Add support for PNG or PNM as watermark images, which was brokenVíctor Paesa
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-18av_free* cleanupMichael Niedermayer
Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18Add const to (mostly) char* and make some functions static, which aren't usedStefan Huehner
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-03-09Watermarking with exact colors.Marcus Engene
Patch by Marcus Engene <hisfirstname(at)hislastname.se> Originally committed as revision 5131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-30add missing #includesDieter
patch by Dieter <freebsd at sopwith solgatos com> Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12Update licensing information: The FSF changed postal address.Diego Biurrun
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17COSMETICS: Remove all trailing whitespace.Diego Biurrun
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-26FreeBSD support as well as some assorted fixesMarcus Engene
patch by the author, Marcus Engene < ffmpeg __ at __ engene __ dot __ se > Originally committed as revision 4665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-18this file got skipped during the API updateMike Melanson
Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26vhook watermark patch by (Marcus Engene: ffmpeg, engene se)Marcus Engene
Originally committed as revision 4309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30switch to native time basesMichael Niedermayer
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25watermark filter by (Marcus Engene <ffmpeg engene se>)Michael Niedermayer
Originally committed as revision 3983 to svn://svn.ffmpeg.org/ffmpeg/trunk