automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-01-22 18:00:19 +00:00
parent ea091271c8
commit 30c9cea332

View File

@@ -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;