diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2008-09-07 18:22:29 +0000 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2008-09-07 18:22:29 +0000 |
commit | 97b93389af2595965ba265dcd3ddd1ebf722fee3 (patch) | |
tree | 42f0e9d8c6c4feb63366c34e8984f42c99696a95 | |
parent | f36aec3b5e18c4c167612d0051a6d5b6144b3552 (diff) | |
download | ffmpeg-97b93389af2595965ba265dcd3ddd1ebf722fee3.tar.gz |
Make ToY and ToUV family of function consistent part I
Convert width argument from int to long (note: srcW is still an int).
Originally committed as revision 27544 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r-- | libswscale/swscale_template.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index ee38bd5646..b855840668 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -1843,7 +1843,7 @@ static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, assert(src1 == src2); } -static inline void RENAME(bgr32ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(bgr32ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -1856,7 +1856,7 @@ static inline void RENAME(bgr32ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(bgr32ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(bgr32ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1 == src2); @@ -2094,7 +2094,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 assert(src1 == src2); } -static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2108,7 +2108,7 @@ static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1==src2); @@ -2130,7 +2130,7 @@ static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } } -static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2144,7 +2144,7 @@ static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(rgb15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(rgb15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1==src2); @@ -2167,7 +2167,7 @@ static inline void RENAME(rgb15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } -static inline void RENAME(rgb32ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(rgb32ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2180,7 +2180,7 @@ static inline void RENAME(rgb32ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(rgb32ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(rgb32ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1==src2); @@ -2199,7 +2199,7 @@ static inline void RENAME(rgb32ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } } -static inline void RENAME(rgb24ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(rgb24ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2212,7 +2212,7 @@ static inline void RENAME(rgb24ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1==src2); @@ -2227,7 +2227,7 @@ static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } } -static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2241,7 +2241,7 @@ static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1 == src2); @@ -2260,7 +2260,7 @@ static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } } -static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width) +static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, long width) { int i; for (i=0; i<width; i++) @@ -2274,7 +2274,7 @@ static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width) } } -static inline void RENAME(bgr15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) +static inline void RENAME(bgr15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width) { int i; assert(src1 == src2); @@ -2293,7 +2293,7 @@ static inline void RENAME(bgr15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 } } -static inline void RENAME(palToY)(uint8_t *dst, uint8_t *src, int width, uint32_t *pal) +static inline void RENAME(palToY)(uint8_t *dst, uint8_t *src, long width, uint32_t *pal) { int i; for (i=0; i<width; i++) @@ -2304,7 +2304,7 @@ static inline void RENAME(palToY)(uint8_t *dst, uint8_t *src, int width, uint32_ } } -static inline void RENAME(palToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal) +static inline void RENAME(palToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width, uint32_t *pal) { int i; assert(src1 == src2); |