summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale-example.c17
-rw-r--r--libswscale/swscale.c2
2 files changed, 6 insertions, 13 deletions
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index 4bb42162ef..b5f8d5e230 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -133,14 +133,11 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat
ssdU/= w*h/4;
ssdV/= w*h/4;
- if (ssdY>100 || ssdU>100 || ssdV>100){
- printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n",
- sws_format_name(srcFormat), srcW, srcH,
- sws_format_name(dstFormat), dstW, dstH,
- flags,
- ssdY, ssdU, ssdV);
- fflush(stdout);
- }
+ printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n",
+ sws_format_name(srcFormat), srcW, srcH,
+ sws_format_name(dstFormat), dstW, dstH,
+ flags, ssdY, ssdU, ssdV);
+ fflush(stdout);
end:
@@ -157,10 +154,6 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat
return res;
}
-void fast_memcpy(void *a, void *b, int s){ //FIXME
- memcpy(a, b, s);
-}
-
static void selfTest(uint8_t *src[3], int stride[3], int w, int h){
enum PixelFormat srcFormat, dstFormat;
int srcW, srcH, dstW, dstH;
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index a7c42c8371..ff2d1d49d4 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1229,7 +1229,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF
else if (flags & SWS_SPLINE)
{
double p=-2.196152422706632;
- coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, d) * fone;
+ coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, floatd) * fone;
}
else {
coeff= 0.0; //GCC warning killer