[FFmpeg-cvslog] r29145 - in trunk/libswscale: swscale.c swscale_internal.h swscale_template.c

[Cédric Schieli]

2009/4/11 Ramiro Polla <ramiro at lisha.ufsc.br>:

[...]

>> Index: ffmpeg/libswscale/swscale_template.c
>> ===================================================================
>> --- ffmpeg.orig/libswscale/swscale_template.c ? 2009-04-11
>> 10:20:05.451743306 +0200
>> +++ ffmpeg/libswscale/swscale_template.c ? ? ? ?2009-04-11
>> 10:20:41.923778160 +0200
>> @@ -2276,15 +2276,18 @@ static inline void RENAME(hyscale)(SwsCo
>> ? ? if (isAlpha) {
>> ? ? ? ? if (srcFormat == PIX_FMT_RGB32 ? || srcFormat == PIX_FMT_BGR32 ?)
>> ? ? ? ? ? ? src += 3;
>> + ? ? ? ?if (c->hascale_internal) {
>> + ? ? ? ? ? ?c->hascale_internal(formatConvBuffer, src, srcW, pal);
>> + ? ? ? ? ? ?src= formatConvBuffer;
>> + ? ? ? ?}
>> ? ? } else {
>> ? ? ? ? if (srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
>> ? ? ? ? ? ? src += ALT32_CORR;
>> - ? ?}
>> -
>> ? ? if (c->hyscale_internal) {
>> ? ? ? ? c->hyscale_internal(formatConvBuffer, src, srcW, pal);
>> ? ? ? ? src= formatConvBuffer;
>> ? ? }
>> + ? ?}
>
> Is there no clean way to avoid duplicating if(c->foo){c->foo();src=bar} ?

You may prefer this one.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sws_fix_rgb32.patch
Type: text/x-patch
Size: 3134 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20090411/b77d5059/attachment.bin>