[FFmpeg-cvslog] avcodec/wavpack fix *void pointer arithmetic

Michael Niedermayer git at videolan.org
Mon Dec 23 23:14:25 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 23 23:06:10 2013 +0100| [95953c1cfd51cb162190280c1c543e3314da3d63] | committer: Michael Niedermayer

avcodec/wavpack fix *void pointer arithmetic

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

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

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

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index e1abe8d..6f60514 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -490,8 +490,8 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
 
     if (last && count < s->samples) {
         int size = av_get_bytes_per_sample(type);
-        memset(dst_l + count*size, 0, (s->samples-count)*size);
-        memset(dst_r + count*size, 0, (s->samples-count)*size);
+        memset((uint8_t*)dst_l + count*size, 0, (s->samples-count)*size);
+        memset((uint8_t*)dst_r + count*size, 0, (s->samples-count)*size);
     }
 
     if ((s->avctx->err_recognition & AV_EF_CRCCHECK) &&
@@ -558,7 +558,7 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
 
     if (last && count < s->samples) {
         int size = av_get_bytes_per_sample(type);
-        memset(dst + count*size, 0, (s->samples-count)*size);
+        memset((uint8_t*)dst + count*size, 0, (s->samples-count)*size);
     }
 
     if (s->avctx->err_recognition & AV_EF_CRCCHECK) {



More information about the ffmpeg-cvslog mailing list