[FFmpeg-cvslog] swscale: Fix use of uninitialized values

Michael Niedermayer git at videolan.org
Thu Jun 2 21:24:54 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun  2 19:26:40 2011 +0200| [877f76ad33bb9b0b0d09565dd9ec1cf8e91096f1] | committer: Michael Niedermayer

swscale: Fix use of uninitialized values
(bug probably introduced from a marge of libav)

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

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

 libswscale/swscale_template.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 3555883..6c85487 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -419,6 +419,8 @@ static inline void hyscale_fast_c(SwsContext *c, int16_t *dst, int dstWidth,
         dst[i]= (src[xx]<<7) + (src[xx+1] - src[xx])*xalpha;
         xpos+=xInc;
     }
+    for (i=dstWidth-1; (i*xInc)>>16 >=srcW-1; i--)
+        dst[i] = src[srcW-1]*128;
 }
 
       // *** horizontal scale Y line to temp buffer
@@ -465,6 +467,10 @@ static inline void hcscale_fast_c(SwsContext *c, int16_t *dst1, int16_t *dst2,
         dst2[i]=(src2[xx]*(xalpha^127)+src2[xx+1]*xalpha);
         xpos+=xInc;
     }
+    for (i=dstWidth-1; (i*xInc)>>16 >=srcW-1; i--) {
+        dst1[i] = src1[srcW-1]*128;
+        dst2[i] = src2[srcW-1]*128;
+    }
 }
 
 inline static void hcscale_c(SwsContext *c, uint16_t *dst1, uint16_t *dst2, int dstWidth,



More information about the ffmpeg-cvslog mailing list