automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-28 18:01:52 +00:00
parent 93efe68235
commit ae1a27ae61
14 changed files with 35 additions and 40 deletions

View File

@@ -198,7 +198,7 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s)
/* IF we have an optimization frame, send it */
if (s->opt) {
if (s->opt->offset < AST_FRIENDLY_OFFSET)
ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).",
ast_log(LOG_WARNING, "Returning a frame of inappropriate offset (%d).\n",
s->opt->offset);
opt = s->opt;
s->opt = NULL;