automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago · 30c9cea332
parent ea091271c8
commit 30c9cea332
1 changed files with 1 additions and 1 deletions
--- a/channel.c
+++ b/channel.c
@ -3830,7 +3830,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;