summaryrefslogtreecommitdiffstats
path: root/vhook/watermark.c
Commit message (Collapse)AuthorAgeFilesLines
* The watermark vhook cannot handle truncated bitstreams.Víctor Paesa2007-07-051-4/+0
| | | | Originally committed as revision 9473 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not use return with argument for a function "returning" void.Reimar Döffinger2007-05-131-2/+2
| | | | Originally committed as revision 9016 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace forbidden exit() by return() Víctor Paesa, wzrlpy arsystel com.Diego Biurrun2007-04-011-5/+5
| | | | Originally committed as revision 8592 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated PIX_FMT names by the newer variants.Diego Biurrun2007-02-071-18/+18
| | | | Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling/grammar fixesDiego Biurrun2006-10-221-11/+11
| | | | Originally committed as revision 6757 to svn://svn.ffmpeg.org/ffmpeg/trunk
* port watermark vhook to swscalerVíctor Paesa2006-10-111-17/+91
| | | | | | | | | 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
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Re-Add support for PNG or PNM as watermark images, which was brokenVíctor Paesa2006-08-301-0/+4
| | | | | | | | | | 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
* av_free* cleanupMichael Niedermayer2006-08-181-10/+3
| | | | Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add const to (mostly) char* and make some functions static, which aren't usedStefan Huehner2006-06-181-2/+2
| | | | | | | 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
* Watermarking with exact colors.Marcus Engene2006-03-091-17/+156
| | | | | | Patch by Marcus Engene <hisfirstname(at)hislastname.se> Originally committed as revision 5131 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add missing #includesDieter2006-01-301-0/+1
| | | | | | patch by Dieter <freebsd at sopwith solgatos com> Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-171-78/+78
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* FreeBSD support as well as some assorted fixesMarcus Engene2005-10-261-13/+14
| | | | | | patch by the author, Marcus Engene < ffmpeg __ at __ engene __ dot __ se > Originally committed as revision 4665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* this file got skipped during the API updateMike Melanson2005-07-181-4/+4
| | | | Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vhook watermark patch by (Marcus Engene: ffmpeg, engene se)Marcus Engene2005-05-261-0/+6
| | | | Originally committed as revision 4309 to svn://svn.ffmpeg.org/ffmpeg/trunk
* switch to native time basesMichael Niedermayer2005-04-301-2/+2
| | | | Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
* watermark filter by (Marcus Engene <ffmpeg engene se>)Michael Niedermayer2005-02-251-0/+441
Originally committed as revision 3983 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud