Mercurial > mplayer.hg
comparison postproc/swscale.c @ 16783:3ea7f6ab11b1
100l -- mismatched type after changing sizes to type long!
| author | rfelker |
|---|---|
| date | Mon, 17 Oct 2005 05:05:51 +0000 |
| parents | 4a1faa9c8f07 |
| children | 08cac43f1e38 |
comparison
equal
deleted
inserted
replaced
| 16782:1816685a3d7b | 16783:3ea7f6ab11b1 |
|---|---|
| 1473 const int dstFormat= c->dstFormat; | 1473 const int dstFormat= c->dstFormat; |
| 1474 const int srcBpp= ((srcFormat&0xFF) + 7)>>3; | 1474 const int srcBpp= ((srcFormat&0xFF) + 7)>>3; |
| 1475 const int dstBpp= ((dstFormat&0xFF) + 7)>>3; | 1475 const int dstBpp= ((dstFormat&0xFF) + 7)>>3; |
| 1476 const int srcId= (srcFormat&0xFF)>>2; // 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 | 1476 const int srcId= (srcFormat&0xFF)>>2; // 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 |
| 1477 const int dstId= (dstFormat&0xFF)>>2; | 1477 const int dstId= (dstFormat&0xFF)>>2; |
| 1478 void (*conv)(const uint8_t *src, uint8_t *dst, unsigned src_size)=NULL; | 1478 void (*conv)(const uint8_t *src, uint8_t *dst, long src_size)=NULL; |
| 1479 | 1479 |
| 1480 /* BGR -> BGR */ | 1480 /* BGR -> BGR */ |
| 1481 if( (isBGR(srcFormat) && isBGR(dstFormat)) | 1481 if( (isBGR(srcFormat) && isBGR(dstFormat)) |
| 1482 || (isRGB(srcFormat) && isRGB(dstFormat))){ | 1482 || (isRGB(srcFormat) && isRGB(dstFormat))){ |
| 1483 switch(srcId | (dstId<<4)){ | 1483 switch(srcId | (dstId<<4)){ |