Commit 3483d877 authored by Eli Friedman's avatar Eli Friedman Committed by Carl Eugen Hoyos

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
parent bb943bb8
...@@ -989,7 +989,7 @@ static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, ...@@ -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) uint32_t *unused)
{ {
int i; int i;
...@@ -1004,7 +1004,7 @@ static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, int width, ...@@ -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, static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src1, const uint8_t *src2, const uint8_t *src1, const uint8_t *src2,
int width, uint32_t *unused) long width, uint32_t *unused)
{ {
int i; int i;
assert(src1==src2); assert(src1==src2);
...@@ -1020,7 +1020,7 @@ static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV, ...@@ -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, static inline void rgb48ToUV_half(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src1, const uint8_t *src2, const uint8_t *src1, const uint8_t *src2,
int width, uint32_t *unused) long width, uint32_t *unused)
{ {
int i; int i;
assert(src1==src2); assert(src1==src2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment