[asterisk-commits] qwell: branch 1.8 r305131 - in /branches/1.8: ./ res/res_musiconhold.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 31 15:00:29 CST 2011
Author: qwell
Date: Mon Jan 31 15:00:25 2011
New Revision: 305131
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305131
Log:
Merged revisions 305130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r305130 | qwell | 2011-01-31 14:59:37 -0600 (Mon, 31 Jan 2011) | 9 lines
Merged revisions 305129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r305129 | qwell | 2011-01-31 14:56:25 -0600 (Mon, 31 Jan 2011) | 2 lines
Set file descriptors to -1 on creation, so that we don't see weirdness later.
........
................
Modified:
branches/1.8/ (props changed)
branches/1.8/res/res_musiconhold.c
Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.
Modified: branches/1.8/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_musiconhold.c?view=diff&rev=305131&r1=305130&r2=305131
==============================================================================
--- branches/1.8/res/res_musiconhold.c (original)
+++ branches/1.8/res/res_musiconhold.c Mon Jan 31 15:00:25 2011
@@ -1277,6 +1277,8 @@
#endif
)) {
class->format = AST_FORMAT_SLINEAR;
+ class->srcfd = -1;
+ class->pseudofd = -1;
}
return class;
More information about the asterisk-commits
mailing list