automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-25 05:04:25 +00:00
parent 2dc3679b6e
commit 2719e0aa02
2 changed files with 47 additions and 35 deletions

View File

@@ -1164,7 +1164,12 @@ static void queue_frame_to_spies(struct ast_channel *chan, struct ast_frame *f,
trans->last_format = f->subclass;
}
}
translated_frame = ast_translate(trans->path, f, 0);
if (!(translated_frame = ast_translate(trans->path, f, 0))) {
ast_log(LOG_ERROR, "Translation to %s failed, dropping frame for spies\n",
ast_getformatname(AST_FORMAT_SLINEAR));
ast_mutex_unlock(&spy->lock);
break;
}
}
for (last = queue->head; last && last->next; last = last->next);