Statistics
| Branch: | Revision:

ffmpeg / vhook / watermark.c @ 41415d28

History | View | Annotate | Download (22.6 KB)

# Date Author Comment
ed77a6c9 07/05/2007 05:13 AM Víctor Paesa

The watermark vhook cannot handle truncated bitstreams.

Originally committed as revision 9473 to svn://svn.ffmpeg.org/ffmpeg/trunk

3a136a06 05/13/2007 04:26 PM Reimar Döffinger

Do not use return with argument for a function "returning" void.

Originally committed as revision 9016 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca345e44 04/01/2007 05:23 PM Diego Biurrun

Replace forbidden exit() by return() Víctor Paesa, wzrlpy arsystel com.

Originally committed as revision 8592 to svn://svn.ffmpeg.org/ffmpeg/trunk

71e445fc 02/07/2007 01:48 AM Diego Biurrun

Replace deprecated PIX_FMT names by the newer variants.

Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk

8dfcf67e 10/22/2006 12:12 PM Diego Biurrun

spelling/grammar fixes

Originally committed as revision 6757 to svn://svn.ffmpeg.org/ffmpeg/trunk

2d7490fc 10/11/2006 12:11 PM Víctor Paesa

port watermark vhook to swscaler
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

b78e7197 10/07/2006 03:30 PM Diego Biurrun

Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk

dd933153 08/30/2006 02:11 PM Víctor Paesa

Re-Add support for PNG or PNM as watermark images, which was broken
since the move to image2 API
Patch by Victor Paesa <>
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

b4902c11 08/18/2006 08:05 AM Michael Niedermayer

av_free* cleanup

Originally committed as revision 6019 to svn://svn.ffmpeg.org/ffmpeg/trunk

7b49ce2e 06/18/2006 11:33 AM Stefan Huehner

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

ed818e25 03/09/2006 02:39 PM Marcus Engene

Watermarking with exact colors.
Patch by Marcus Engene <hisfirstname(at)hislastname.se>

Originally committed as revision 5131 to svn://svn.ffmpeg.org/ffmpeg/trunk

a851b8e8 01/30/2006 11:32 PM Dieter

add missing #includes
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4912 to svn://svn.ffmpeg.org/ffmpeg/trunk

5509bffa 01/12/2006 10:43 PM Diego Biurrun

Update licensing information: The FSF changed postal address.

Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk

115329f1 12/17/2005 06:14 PM Diego Biurrun

COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk

f368375c 10/26/2005 08:16 PM Marcus Engene

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

a2cfc4d6 07/18/2005 04:43 PM Mike Melanson

this file got skipped during the API update

Originally committed as revision 4455 to svn://svn.ffmpeg.org/ffmpeg/trunk

ded78ac0 05/26/2005 09:18 AM Marcus Engene

vhook watermark patch by (Marcus Engene: ffmpeg, engene se)

Originally committed as revision 4309 to svn://svn.ffmpeg.org/ffmpeg/trunk

c0df9d75 04/30/2005 09:43 PM Michael Niedermayer

switch to native time bases

Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk

21754ce6 02/25/2005 10:22 PM Michael Niedermayer

watermark filter by (Marcus Engene <ffmpeg engene se>)

Originally committed as revision 3983 to svn://svn.ffmpeg.org/ffmpeg/trunk