[svn-commits] qwell: trunk r305132 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Jan 31 15:01:28 2011
New Revision: 305132

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305132
Log:
Merged revisions 305131 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305131 | qwell | 2011-01-31 15:00:25 -0600 (Mon, 31 Jan 2011) | 16 lines
  
  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:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=305132&r1=305131&r2=305132
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Mon Jan 31 15:01:28 2011
@@ -1277,6 +1277,8 @@
 #endif
 		)) {
 		class->format = AST_FORMAT_SLINEAR;
+		class->srcfd = -1;
+		class->pseudofd = -1;
 	}
 
 	return class;