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

[Marcus Engene]

Michael Niedermayer wrote:
> 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
>
> [...]
I removed a couple of if() - would you prefer to have the indentation 
looking like a French car from the 50s?

Best regards,
Marcus