cast to correct type, suppress warnings
Originally committed as revision 26946 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
parent
3e62b7e34c
commit
87cf861c7d
@ -2539,7 +2539,7 @@ static inline void RENAME(hyscale)(uint16_t *dst, long dstWidth, uint8_t *src, i
|
|||||||
}
|
}
|
||||||
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
||||||
{
|
{
|
||||||
RENAME(palToY)(formatConvBuffer, src, srcW, pal);
|
RENAME(palToY)(formatConvBuffer, src, srcW, (uint32_t*)pal);
|
||||||
src= formatConvBuffer;
|
src= formatConvBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2755,7 +2755,7 @@ inline static void RENAME(hcscale)(uint16_t *dst, long dstWidth, uint8_t *src1,
|
|||||||
}
|
}
|
||||||
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
||||||
{
|
{
|
||||||
RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
|
||||||
src1= formatConvBuffer;
|
src1= formatConvBuffer;
|
||||||
src2= formatConvBuffer+VOFW;
|
src2= formatConvBuffer+VOFW;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user