diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:07:05 +0200 |
| commit | cd6f5c4895c49b483542030324ea5198521ab28b (patch) | |
| tree | c1ae5a95d3b19de827e98270ff060124086c4414 /libavcodec/g722enc.c | |
| parent | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (diff) | |
| parent | 6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 (diff) | |
| download | ffmpeg-cd6f5c4895c49b483542030324ea5198521ab28b.tar.gz | |
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
| -rw-r--r-- | libavcodec/g722enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index d3c72981ca..39f83dcba4 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -197,7 +197,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; |