virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

swscale: fix warning: assignment from incompatible pointer type

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-12-29 19:39:14 +01:00
parent 05d81a57f5
commit aa9507cc3d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/swscale.c
View File

@@ -586,8 +586,8 @@ static int swScale(SwsContext *c, const uint8_t *src[],
// || yuv2planeX == yuv2planeX_8_c) || !ARCH_X86); // || yuv2planeX == yuv2planeX_8_c) || !ARCH_X86);
if(use_mmx_vfilter){ if(use_mmx_vfilter){
vLumFilter= c->lumMmxFilter; vLumFilter= (int16_t *)c->lumMmxFilter;
vChrFilter= c->chrMmxFilter; vChrFilter= (int16_t *)c->chrMmxFilter;
} }
if (vLumFilterSize == 1) { if (vLumFilterSize == 1) {
@@ -618,7 +618,7 @@ static int swScale(SwsContext *c, const uint8_t *src[],
if (CONFIG_SWSCALE_ALPHA && alpPixBuf) { if (CONFIG_SWSCALE_ALPHA && alpPixBuf) {
if(use_mmx_vfilter){ if(use_mmx_vfilter){
vLumFilter= c->alpMmxFilter; vLumFilter= (int16_t *)c->alpMmxFilter;
} }
if (vLumFilterSize == 1) { if (vLumFilterSize == 1) {
yuv2plane1(alpSrcPtr[0], dest[3], dstW, yuv2plane1(alpSrcPtr[0], dest[3], dstW,