RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
D Richard Felker III 2004-05-01 20:15:21 +00:00
parent bb801c97ea
commit ae4cffd9fc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postproc/rgb2rgb_template.c
View File

@ -388,7 +388,7 @@ static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, unsigned
#endif #endif
while(s < end) 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&0xFF)>>3) + ((src&0xFC00)>>5) + ((src&0xF80000)>>8);
// *d++ = ((src>>3)&0x1F) + ((src>>5)&0x7E0) + ((src>>8)&0xF800); // *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 #endif
while(s < end) 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); *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 #endif
while(s < end) 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); *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 #endif
while(s < end) 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); *d++ = ((src&0xF8)<<7) + ((src&0xF800)>>6) + ((src&0xF80000)>>19);
} }
} }

12
postproc/swscale.c
View File

@ -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)[3]= r[Y2];\
((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\
((uint8_t*)dest)[5]= b[Y2];\ ((uint8_t*)dest)[5]= b[Y2];\
((uint8_t*)dest)+=6;\ dest+=6;\
}\ }\
break;\ break;\
case IMGFMT_BGR24:\ 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)[3]= b[Y2];\
((uint8_t*)dest)[4]= g[Y2];\ ((uint8_t*)dest)[4]= g[Y2];\
((uint8_t*)dest)[5]= r[Y2];\ ((uint8_t*)dest)[5]= r[Y2];\
((uint8_t*)dest)+=6;\ dest+=6;\
}\ }\
break;\ break;\
case IMGFMT_RGB16:\ 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+6]*yalpha1+buf1[i+6]*yalpha)>>19) + d128[6]];\
acc+= acc + g[((buf0[i+7]*yalpha1+buf1[i+7]*yalpha)>>19) + d128[7]];\ acc+= acc + g[((buf0[i+7]*yalpha1+buf1[i+7]*yalpha)>>19) + d128[7]];\
((uint8_t*)dest)[0]= acc;\ ((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)[3]= r[Y2];
((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[4]= g[Y2];
((uint8_t*)dest)[5]= b[Y2]; ((uint8_t*)dest)[5]= b[Y2];
((uint8_t*)dest)+=6; dest+=6;
} }
break; break;
case IMGFMT_BGR24: 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)[3]= b[Y2];
((uint8_t*)dest)[4]= g[Y2]; ((uint8_t*)dest)[4]= g[Y2];
((uint8_t*)dest)[5]= r[Y2]; ((uint8_t*)dest)[5]= r[Y2];
((uint8_t*)dest)+=6; dest+=6;
} }
break; break;
case IMGFMT_RGB16: 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]]; acc+= acc + g[Y2+d128[(i+1)&7]];
if((i&7)==6){ if((i&7)==6){
((uint8_t*)dest)[0]= acc; ((uint8_t*)dest)[0]= acc;
((uint8_t*)dest)++; dest++;
} }
} }
} }