From 3483d87752098cbd4ee11741847fd394db46f331 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sat, 3 Jul 2010 09:58:13 +0000 Subject: [PATCH] Fix 'assignment from incompatible pointer type' warning. Patch by Eli Friedman, eli d friedman a gmail Originally committed as revision 31628 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a64c09b334..425feaabb0 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -989,7 +989,7 @@ static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, } } -static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, int width, +static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused) { int i; @@ -1004,7 +1004,7 @@ static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, int width, static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, - int width, uint32_t *unused) + long width, uint32_t *unused) { int i; assert(src1==src2); @@ -1020,7 +1020,7 @@ static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV, static inline void rgb48ToUV_half(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, - int width, uint32_t *unused) + long width, uint32_t *unused) { int i; assert(src1==src2);