Changeset 90cad5ed in ffmpeg
- Timestamp:
- Dec 19, 2011, 3:02:51 PM (13 years ago)
- Branches:
- master
- Children:
- 32a92d32
- Parents:
- 9c5104e8
- git-author:
- Michael Niedermayer <michaelni@gmx.at> (12/19/11 14:48:47)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (12/19/11 15:02:51)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libswscale/utils.c
r9c5104e8 r90cad5ed 221 221 } else if (flags&SWS_POINT) { // lame looking point sampling mode 222 222 int i; 223 int xDstInSrc;223 int64_t xDstInSrc; 224 224 filterSize= 1; 225 225 FF_ALLOC_OR_GOTO(NULL, filter, dstW*sizeof(*filter)*filterSize, fail); … … 235 235 } else if ((xInc <= (1<<16) && (flags&SWS_AREA)) || (flags&SWS_FAST_BILINEAR)) { // bilinear upscale 236 236 int i; 237 int xDstInSrc;237 int64_t xDstInSrc; 238 238 filterSize= 2; 239 239 FF_ALLOC_OR_GOTO(NULL, filter, dstW*sizeof(*filter)*filterSize, fail); … … 247 247 //bilinear upscale / linear interpolate / area averaging 248 248 for (j=0; j<filterSize; j++) { 249 int64_t coeff= fone - FFABS(( xx<<16) - xDstInSrc)*(fone>>16);249 int64_t coeff= fone - FFABS(((int64_t)xx<<16) - xDstInSrc)*(fone>>16); 250 250 if (coeff<0) coeff=0; 251 251 filter[i*filterSize + j]= coeff; … … 255 255 } 256 256 } else { 257 int xDstInSrc;257 int64_t xDstInSrc; 258 258 int sizeFactor; 259 259 … … 284 284 (*filterPos)[i]= xx; 285 285 for (j=0; j<filterSize; j++) { 286 int64_t d= ( (int64_t)FFABS((xx<<17) - xDstInSrc))<<13;286 int64_t d= (FFABS(((int64_t)xx<<17) - xDstInSrc))<<13; 287 287 double floatd; 288 288 int64_t coeff;
Note:
See TracChangeset
for help on using the changeset viewer.