[FFmpeg-cvslog] g722enc: fix size argument in memset

Janne Grunau git at videolan.org
Thu Oct 25 21:29:16 CEST 2012


ffmpeg | branch: release/0.10 | Janne Grunau <janne-libav at jannau.net> | Tue Oct  9 20:56:58 2012 +0200| [cc88dacc1aa3b0a8a9077ed8a527894ce06d3b96] | committer: Michael Niedermayer

g722enc: fix size argument in memset

Fixes CID700725.
(cherry picked from commit f1de23faaa61ecf3706055f2da97f5b92aa07d9c)

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

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

 libavcodec/g722enc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index b5707e3..595afae 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -174,7 +174,7 @@ static void g722_encode_trellis(G722Context *c, int trellis,
     for (i = 0; i < 2; i++) {
         nodes[i] = c->nodep_buf[i];
         nodes_next[i] = c->nodep_buf[i] + frontier;
-        memset(c->nodep_buf[i], 0, 2 * frontier * sizeof(*c->nodep_buf));
+        memset(c->nodep_buf[i], 0, 2 * frontier * sizeof(*c->nodep_buf[i]));
         nodes[i][0] = c->node_buf[i] + frontier;
         nodes[i][0]->ssd = 0;
         nodes[i][0]->path = 0;



More information about the ffmpeg-cvslog mailing list