OSDN Git Service

cast to correct type, suppress warnings
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sun, 1 Jun 2008 03:28:15 +0000 (03:28 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sun, 1 Jun 2008 03:28:15 +0000 (03:28 +0000)
Originally committed as revision 26946 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

libswscale/swscale_template.c

index 360b592..f76c594 100644 (file)
@@ -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;
     }