diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 19:39:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 19:39:42 +0100 |
| commit | aa9507cc3d56cc77f078afe5a1f88ebce09072f2 (patch) | |
| tree | 4e28ce0fae0b77b3ad554392361e09ae0a317b03 /libswscale | |
| parent | 05d81a57f56aa1329a18c41207c7e8cef7b7317f (diff) | |
| download | ffmpeg-aa9507cc3d56cc77f078afe5a1f88ebce09072f2.tar.gz | |
swscale: fix warning: assignment from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ec42440d97..442d88bf01 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -586,8 +586,8 @@ static int swScale(SwsContext *c, const uint8_t *src[], // || yuv2planeX == yuv2planeX_8_c) || !ARCH_X86); if(use_mmx_vfilter){ - vLumFilter= c->lumMmxFilter; - vChrFilter= c->chrMmxFilter; + vLumFilter= (int16_t *)c->lumMmxFilter; + vChrFilter= (int16_t *)c->chrMmxFilter; } if (vLumFilterSize == 1) { @@ -618,7 +618,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { if(use_mmx_vfilter){ - vLumFilter= c->alpMmxFilter; + vLumFilter= (int16_t *)c->alpMmxFilter; } if (vLumFilterSize == 1) { yuv2plane1(alpSrcPtr[0], dest[3], dstW, |