Mercurial > libavcodec.hg

comparison mpegvideo.c @ 4120:8fe20344c9b5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename SWAP macro to FFSWAP.
author diego
date Wed, 01 Nov 2006 21:28:36 +0000
parents bfc1532904eb
children fb40acd09af3
comparison
equal deleted inserted replaced
4119:85438e10d72d 4120:8fe20344c9b5
1703 1703
1704 buf[sy*stride + sx]+= color; 1704 buf[sy*stride + sx]+= color;
1705 1705
1706 if(FFABS(ex - sx) > FFABS(ey - sy)){ 1706 if(FFABS(ex - sx) > FFABS(ey - sy)){
1707 if(sx > ex){ 1707 if(sx > ex){
1708 SWAP(int, sx, ex); 1708 FFSWAP(int, sx, ex);
1709 SWAP(int, sy, ey); 1709 FFSWAP(int, sy, ey);
1710 } 1710 }
1711 buf+= sx + sy*stride; 1711 buf+= sx + sy*stride;
1712 ex-= sx; 1712 ex-= sx;
1713 f= ((ey-sy)<<16)/ex; 1713 f= ((ey-sy)<<16)/ex;
1714 for(x= 0; x <= ex; x++){ 1714 for(x= 0; x <= ex; x++){
1717 buf[ y *stride + x]+= (color*(0x10000-fr))>>16; 1717 buf[ y *stride + x]+= (color*(0x10000-fr))>>16;
1718 buf[(y+1)*stride + x]+= (color* fr )>>16; 1718 buf[(y+1)*stride + x]+= (color* fr )>>16;
1719 } 1719 }
1720 }else{ 1720 }else{
1721 if(sy > ey){ 1721 if(sy > ey){
1722 SWAP(int, sx, ex); 1722 FFSWAP(int, sx, ex);
1723 SWAP(int, sy, ey); 1723 FFSWAP(int, sy, ey);
1724 } 1724 }
1725 buf+= sx + sy*stride; 1725 buf+= sx + sy*stride;
1726 ey-= sy; 1726 ey-= sy;
1727 if(ey) f= ((ex-sx)<<16)/ey; 1727 if(ey) f= ((ex-sx)<<16)/ey;
1728 else f= 0; 1728 else f= 0;