summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-14 19:29:14 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-14 19:29:14 +0000
commitc9a70bb4788620cd4967c0c14e12dd822466f800 (patch)
tree3d14829428e6efa75d392ade4336275fca45cc1a /libswscale
parentaee49d5e5828bec105cadf4d84eb838098f14c41 (diff)
downloadmpv-c9a70bb4788620cd4967c0c14e12dd822466f800.tar.bz2
mpv-c9a70bb4788620cd4967c0c14e12dd822466f800.tar.xz
Avoid some explicit types in sizeof().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27611 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 337b23a1dc..ba6bdaad9b 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1063,7 +1063,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
{
int i;
filterSize= 1;
- filter= av_mallocz(dstW*sizeof(double)*filterSize);
+ filter= av_mallocz(dstW*sizeof(*filter)*filterSize);
for (i=0; i<dstW; i++)
{
@@ -1077,7 +1077,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
int i;
int xDstInSrc;
filterSize= 1;
- filter= av_malloc(dstW*sizeof(double)*filterSize);
+ filter= av_malloc(dstW*sizeof(*filter)*filterSize);
xDstInSrc= xInc/2 - 0x8000;
for (i=0; i<dstW; i++)
@@ -1096,7 +1096,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
if (flags&SWS_BICUBIC) filterSize= 4;
else if (flags&SWS_X ) filterSize= 4;
else filterSize= 2; // SWS_BILINEAR / SWS_AREA
- filter= av_malloc(dstW*sizeof(double)*filterSize);
+ filter= av_malloc(dstW*sizeof(*filter)*filterSize);
xDstInSrc= xInc/2 - 0x8000;
for (i=0; i<dstW; i++)
@@ -1142,7 +1142,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
filterSize= (int)ceil(1 + filterSizeInSrc); // will be reduced later if possible
if (filterSize > srcW-2) filterSize=srcW-2;
- filter= av_malloc(dstW*sizeof(double)*filterSize);
+ filter= av_malloc(dstW*sizeof(*filter)*filterSize);
xDstInSrc= xInc1 / 2.0 - 0.5;
for (i=0; i<dstW; i++)
@@ -1236,7 +1236,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
if (srcFilter) filter2Size+= srcFilter->length - 1;
if (dstFilter) filter2Size+= dstFilter->length - 1;
assert(filter2Size>0);
- filter2= av_malloc(filter2Size*dstW*sizeof(double));
+ filter2= av_malloc(filter2Size*dstW*sizeof(*filter2));
for (i=0; i<dstW; i++)
{
@@ -1328,7 +1328,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
assert(minFilterSize > 0);
filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1));
assert(filterSize > 0);
- filter= av_malloc(filterSize*dstW*sizeof(double));
+ filter= av_malloc(filterSize*dstW*sizeof(*filter));
if (filterSize >= MAX_FILTER_SIZE*16/((flags&SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter)
goto error;
*outFilterSize= filterSize;