diff options
| author | D Richard Felker III <dalias@aerifal.cx> | 2004-05-01 20:15:21 +0000 |
|---|---|---|
| committer | D Richard Felker III <dalias@aerifal.cx> | 2004-05-01 20:15:21 +0000 |
| commit | ae4cffd9fc5bc495692920d646d7d1462315cfa6 (patch) | |
| tree | 8a54747b7603e484ce3aef5a56828261738bc463 | |
| parent | bb801c97ea6c020284a8b2bc4083055d2c59aa86 (diff) | |
| download | ffmpeg-ae4cffd9fc5bc495692920d646d7d1462315cfa6.tar.gz | |
this isn't actually stupid, but it's not valid C and gcc 3.5 rejects it as such
Originally committed as revision 12386 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
| -rw-r--r-- | postproc/rgb2rgb_template.c | 8 | ||||
| -rw-r--r-- | postproc/swscale.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/postproc/rgb2rgb_template.c b/postproc/rgb2rgb_template.c index eda2ccc83a..d051215e75 100644 --- a/postproc/rgb2rgb_template.c +++ b/postproc/rgb2rgb_template.c @@ -388,7 +388,7 @@ static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, unsigned #endif while(s < end) { - const int src= *((uint32_t*)s)++; + const int src= *s; s += 4; *d++ = ((src&0xFF)>>3) + ((src&0xFC00)>>5) + ((src&0xF80000)>>8); // *d++ = ((src>>3)&0x1F) + ((src>>5)&0x7E0) + ((src>>8)&0xF800); } @@ -450,7 +450,7 @@ static inline void RENAME(rgb32tobgr16)(const uint8_t *src, uint8_t *dst, unsign #endif while(s < end) { - const int src= *((uint32_t*)s)++; + const int src= *s; s += 4; *d++ = ((src&0xF8)<<8) + ((src&0xFC00)>>5) + ((src&0xF80000)>>19); } } @@ -546,7 +546,7 @@ static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, unsigned #endif while(s < end) { - const int src= *((uint32_t*)s)++; + const int src= *s; s += 4; *d++ = ((src&0xFF)>>3) + ((src&0xF800)>>6) + ((src&0xF80000)>>9); } } @@ -607,7 +607,7 @@ static inline void RENAME(rgb32tobgr15)(const uint8_t *src, uint8_t *dst, unsign #endif while(s < end) { - const int src= *((uint32_t*)s)++; + const int src= *s; s += 4; *d++ = ((src&0xF8)<<7) + ((src&0xF800)>>6) + ((src&0xF80000)>>19); } } diff --git a/postproc/swscale.c b/postproc/swscale.c index 68f828dbab..f1c9bdb25d 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -356,7 +356,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt ((uint8_t*)dest)[3]= r[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[5]= b[Y2];\ - ((uint8_t*)dest)+=6;\ + dest+=6;\ }\ break;\ case IMGFMT_BGR24:\ @@ -367,7 +367,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt ((uint8_t*)dest)[3]= b[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[5]= r[Y2];\ - ((uint8_t*)dest)+=6;\ + dest+=6;\ }\ break;\ case IMGFMT_RGB16:\ @@ -449,7 +449,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt acc+= acc + g[((buf0[i+6]*yalpha1+buf1[i+6]*yalpha)>>19) + d128[6]];\ acc+= acc + g[((buf0[i+7]*yalpha1+buf1[i+7]*yalpha)>>19) + d128[7]];\ ((uint8_t*)dest)[0]= acc;\ - ((uint8_t*)dest)++;\ + dest++;\ }\ \ /*\ @@ -539,7 +539,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l ((uint8_t*)dest)[3]= r[Y2]; ((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[5]= b[Y2]; - ((uint8_t*)dest)+=6; + dest+=6; } break; case IMGFMT_BGR24: @@ -550,7 +550,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l ((uint8_t*)dest)[3]= b[Y2]; ((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[5]= r[Y2]; - ((uint8_t*)dest)+=6; + dest+=6; } break; case IMGFMT_RGB16: @@ -645,7 +645,7 @@ static inline void yuv2packedXinC(SwsContext *c, int16_t *lumFilter, int16_t **l acc+= acc + g[Y2+d128[(i+1)&7]]; if((i&7)==6){ ((uint8_t*)dest)[0]= acc; - ((uint8_t*)dest)++; + dest++; } } } |