[FFmpeg-devel] PATCH watermark + RGB32 input format stream

[Michael Niedermayer]

On Sun, May 04, 2008 at 09:53:02PM +0200, Marcus Engene wrote:
> Hi,
>
> watermark acts up if the instream is something that offers watermark RGB32 
> (for example qtrle)
>
> I don't know if the magnificent optimization the attached patch disables 
> ever worked or if it was causing trouble after patches to make watermark 
> honor recent api changes.
>
> Best regards,
> Marcus
>

> --- watermark.c.org	2008-05-04 21:06:56.000000000 +0200
> +++ watermark.c	2008-05-04 21:11:33.000000000 +0200
> @@ -208,33 +208,31 @@
>      int thrG = ci->thrG;
>      int thrB = ci->thrB;
>  
> -    if (pix_fmt != PIX_FMT_RGB32) {
> -        int size;
> +    int size;
>  
> -        size = avpicture_get_size(PIX_FMT_RGB32, src_width, src_height);
> -        buf = av_malloc(size);
> +    size = avpicture_get_size(PIX_FMT_RGB32, src_width, src_height);
> +    buf = av_malloc(size);

vhook is deprecated, i will not review patches to it except moving the
filters to avfilter.
and this is full of cosmetics

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080504/1f20438f/attachment.pgp>