diff options
| author | bcoudurier <bcoudurier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-01 03:28:15 +0000 |
|---|---|---|
| committer | bcoudurier <bcoudurier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-01 03:28:15 +0000 |
| commit | 76b6861d77783b3ee97bdfb709c1af11a037dc08 (patch) | |
| tree | 9877095ce8d20195eafe719507355b8a129c344c /libswscale | |
| parent | 1a38d2aaeaa0017f1a928189860f5dae4e5179a8 (diff) | |
| download | mpv-76b6861d77783b3ee97bdfb709c1af11a037dc08.tar.bz2 mpv-76b6861d77783b3ee97bdfb709c1af11a037dc08.tar.xz | |
cast to correct type, suppress warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26946 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 360b592cf4..f76c5948c5 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -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) { - RENAME(palToY)(formatConvBuffer, src, srcW, pal); + RENAME(palToY)(formatConvBuffer, src, srcW, (uint32_t*)pal); 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) { - RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal); + RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal); src1= formatConvBuffer; src2= formatConvBuffer+VOFW; } |