[FFmpeg-cvslog] r31628 - trunk/libswscale/swscale.c

cehoyos subversion
Sat Jul 3 11:58:13 CEST 2010


Author: cehoyos
Date: Sat Jul  3 11:58:13 2010
New Revision: 31628

Log:
Fix 'assignment from incompatible pointer type' warning.

Patch by Eli Friedman, eli d friedman a gmail

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jul  3 03:02:47 2010	(r31627)
+++ trunk/libswscale/swscale.c	Sat Jul  3 11:58:13 2010	(r31628)
@@ -989,7 +989,7 @@ static void fillPlane(uint8_t* plane, in
     }
 }
 
-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
 
 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 *ds
 
 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);



More information about the ffmpeg-cvslog mailing list