mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
Get rid of all that old needlock garbage now that we're using recursive mutexes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
4
file.c
4
file.c
@@ -166,7 +166,7 @@ int ast_stopstream(struct ast_channel *tmp)
|
||||
ast_closestream(tmp->vstream);
|
||||
if (tmp->stream) {
|
||||
ast_closestream(tmp->stream);
|
||||
if (tmp->oldwriteformat && ast_set_write_format(tmp, tmp->oldwriteformat, 1))
|
||||
if (tmp->oldwriteformat && ast_set_write_format(tmp, tmp->oldwriteformat))
|
||||
ast_log(LOG_WARNING, "Unable to restore format back to %d\n", tmp->oldwriteformat);
|
||||
}
|
||||
return 0;
|
||||
@@ -464,7 +464,7 @@ struct ast_filestream *ast_openstream(struct ast_channel *chan, char *filename,
|
||||
}
|
||||
chan->oldwriteformat = chan->writeformat;
|
||||
/* Set the channel to a format we can work with */
|
||||
res = ast_set_write_format(chan, fmts, 1);
|
||||
res = ast_set_write_format(chan, fmts);
|
||||
|
||||
fd = ast_filehelper(filename2, (char *)chan, NULL, ACTION_OPEN);
|
||||
if(fd >= 0)
|
||||
|
Reference in New Issue
Block a user