diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-01-22 17:53:14 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-01-22 17:53:14 +0000 |
commit | c84ec3a3ad41f250202647c79854cf935942457c (patch) | |
tree | 03ef37b05bf94e0ae3df4ef8b6627b8de6bb9bb2 /channel.c | |
parent | 56bb41460ec28bfc1e651239e70ff7c763cc3fae (diff) |
Merged revisions 8437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8437 | russell | 2006-01-22 12:47:13 -0500 (Sun, 22 Jan 2006) | 2 lines
fix MixMonitor crash (issue #6321, probably others)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3911,7 +3911,7 @@ static void copy_data_from_queue(struct ast_channel_spy_queue *queue, short *buf } tocopy = (f->samples > samples) ? samples : f->samples; - bytestocopy = ast_codec_get_len(queue->format, samples); + bytestocopy = ast_codec_get_len(queue->format, tocopy); memcpy(buf, f->data, bytestocopy); samples -= tocopy; buf += tocopy; |