From 58eca5178ac0844a6980ca1156b8db7e6a3a76d1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 18 Nov 2011 21:54:50 +0100 Subject: [PATCH] =?UTF-8?q?sws:=20Fix:=20libswscale/utils.c:941:13:=20warn?= =?UTF-8?q?ing:=20passing=20argument=205=20of=20=E2=80=98initMMX2HScaler?= =?UTF-8?q?=E2=80=99=20from=20incompatible=20pointer=20type=20libswscale/u?= =?UTF-8?q?tils.c:524:12:=20note:=20expected=20=E2=80=98int32=5Ft=20*?= =?UTF-8?q?=E2=80=99=20but=20argument=20is=20of=20type=20=E2=80=98int16=5F?= =?UTF-8?q?t=20*=E2=80=99=20libswscale/utils.c:942:13:=20warning:=20passin?= =?UTF-8?q?g=20argument=205=20of=20=E2=80=98initMMX2HScaler=E2=80=99=20fro?= =?UTF-8?q?m=20incompatible=20pointer=20type=20libswscale/utils.c:524:12:?= =?UTF-8?q?=20note:=20expected=20=E2=80=98int32=5Ft=20*=E2=80=99=20but=20a?= =?UTF-8?q?rgument=20is=20of=20type=20=E2=80=98int16=5Ft=20*=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Niedermayer --- libswscale/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 781f728919..7cc13bf7e5 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -938,8 +938,8 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter) FF_ALLOCZ_OR_GOTO(c, c->hLumFilterPos, (dstW /2/8+8)*sizeof(int32_t), fail); FF_ALLOCZ_OR_GOTO(c, c->hChrFilterPos, (c->chrDstW/2/4+8)*sizeof(int32_t), fail); - initMMX2HScaler( dstW, c->lumXInc, c->lumMmx2FilterCode, c->hLumFilter, c->hLumFilterPos, 8); - initMMX2HScaler(c->chrDstW, c->chrXInc, c->chrMmx2FilterCode, c->hChrFilter, c->hChrFilterPos, 4); + initMMX2HScaler( dstW, c->lumXInc, c->lumMmx2FilterCode, c->hLumFilter, (uint32_t*)c->hLumFilterPos, 8); + initMMX2HScaler(c->chrDstW, c->chrXInc, c->chrMmx2FilterCode, c->hChrFilter, (uint32_t*)c->hChrFilterPos, 4); #ifdef MAP_ANONYMOUS mprotect(c->lumMmx2FilterCode, c->lumMmx2FilterCodeSize, PROT_EXEC | PROT_READ);