[FFmpeg-cvslog] swscale: fix warning: assignment from incompatible pointer type

Michael Niedermayer git at videolan.org
Sat Dec 29 20:55:20 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 29 19:39:14 2012 +0100| [aa9507cc3d56cc77f078afe5a1f88ebce09072f2] | committer: Michael Niedermayer

swscale: fix warning: assignment from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa9507cc3d56cc77f078afe5a1f88ebce09072f2
---

 libswscale/swscale.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index ec42440..442d88b 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,



More information about the ffmpeg-cvslog mailing list