Add some explicit casts to avoid "assignment from incompatible pointer type"

warnings

Originally committed as revision 21774 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Luca Abeni 2006-12-26 17:41:38 +00:00
parent a4da50e17f
commit 628bc5e862
2 changed files with 15 additions and 15 deletions

View File

@ -417,9 +417,9 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
#define YSCALE_YUV_2_RGBX_C(type) \ #define YSCALE_YUV_2_RGBX_C(type) \
YSCALE_YUV_2_PACKEDX_C(type)\ YSCALE_YUV_2_PACKEDX_C(type)\
r = c->table_rV[V];\ r = (type *)c->table_rV[V];\
g = c->table_gU[U] + c->table_gV[V];\ g = (type *)(c->table_gU[U] + c->table_gV[V]);\
b = c->table_bU[U];\ b = (type *)c->table_bU[U];\
#define YSCALE_YUV_2_PACKED2_C \ #define YSCALE_YUV_2_PACKED2_C \
for(i=0; i<(dstW>>1); i++){\ for(i=0; i<(dstW>>1); i++){\
@ -432,9 +432,9 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
#define YSCALE_YUV_2_RGB2_C(type) \ #define YSCALE_YUV_2_RGB2_C(type) \
YSCALE_YUV_2_PACKED2_C\ YSCALE_YUV_2_PACKED2_C\
type *r, *b, *g;\ type *r, *b, *g;\
r = c->table_rV[V];\ r = (type *)c->table_rV[V];\
g = c->table_gU[U] + c->table_gV[V];\ g = (type *)(c->table_gU[U] + c->table_gV[V]);\
b = c->table_bU[U];\ b = (type *)c->table_bU[U];\
#define YSCALE_YUV_2_PACKED1_C \ #define YSCALE_YUV_2_PACKED1_C \
for(i=0; i<(dstW>>1); i++){\ for(i=0; i<(dstW>>1); i++){\
@ -447,9 +447,9 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
#define YSCALE_YUV_2_RGB1_C(type) \ #define YSCALE_YUV_2_RGB1_C(type) \
YSCALE_YUV_2_PACKED1_C\ YSCALE_YUV_2_PACKED1_C\
type *r, *b, *g;\ type *r, *b, *g;\
r = c->table_rV[V];\ r = (type *)c->table_rV[V];\
g = c->table_gU[U] + c->table_gV[V];\ g = (type *)(c->table_gU[U] + c->table_gV[V]);\
b = c->table_bU[U];\ b = (type *)c->table_bU[U];\
#define YSCALE_YUV_2_PACKED1B_C \ #define YSCALE_YUV_2_PACKED1B_C \
for(i=0; i<(dstW>>1); i++){\ for(i=0; i<(dstW>>1); i++){\
@ -462,9 +462,9 @@ static inline void yuv2nv12XinC(int16_t *lumFilter, int16_t **lumSrc, int lumFil
#define YSCALE_YUV_2_RGB1B_C(type) \ #define YSCALE_YUV_2_RGB1B_C(type) \
YSCALE_YUV_2_PACKED1B_C\ YSCALE_YUV_2_PACKED1B_C\
type *r, *b, *g;\ type *r, *b, *g;\
r = c->table_rV[V];\ r = (type *)c->table_rV[V];\
g = c->table_gU[U] + c->table_gV[V];\ g = (type *)(c->table_gU[U] + c->table_gV[V]);\
b = c->table_bU[U];\ b = (type *)c->table_bU[U];\
#define YSCALE_YUV_2_ANYRGB_C(func, func2)\ #define YSCALE_YUV_2_ANYRGB_C(func, func2)\
switch(c->dstFormat)\ switch(c->dstFormat)\

View File

@ -213,9 +213,9 @@ const int32_t Inverse_Table_6_9[8][4] = {
#define RGB(i) \ #define RGB(i) \
U = pu[i]; \ U = pu[i]; \
V = pv[i]; \ V = pv[i]; \
r = c->table_rV[V]; \ r = (void *)c->table_rV[V]; \
g = c->table_gU[U] + c->table_gV[V]; \ g = (void *)(c->table_gU[U] + c->table_gV[V]); \
b = c->table_bU[U]; b = (void *)c->table_bU[U];
#define DST1(i) \ #define DST1(i) \
Y = py_1[2*i]; \ Y = py_1[2*i]; \