Merged revisions 90142 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90142 | russell | 2007-11-28 18:06:08 -0600 (Wed, 28 Nov 2007) | 4 lines

Merge a change from team/russell/chan_refcount ...

This makes ast_stopstream() thread-safe.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-11-29 00:07:32 +00:00
parent 68f8257484
commit 8a3e984b0c
2 changed files with 11 additions and 1 deletions

View File

@@ -119,6 +119,8 @@ int ast_format_unregister(const char *name)
int ast_stopstream(struct ast_channel *tmp)
{
ast_channel_lock(tmp);
/* Stop a running stream if there is one */
if (tmp->stream) {
ast_closestream(tmp->stream);
@@ -131,6 +133,9 @@ int ast_stopstream(struct ast_channel *tmp)
ast_closestream(tmp->vstream);
tmp->vstream = NULL;
}
ast_channel_unlock(tmp);
return 0;
}