[svn-commits] file: branch 1.6.2 r184650 - in /branches/1.6.2: ./ bridges/bridge_softmix.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Mar 27 09:22:25 2009
New Revision: 184650

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184650
Log:
Merged revisions 184639 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184639 | file | 2009-03-27 11:18:40 -0300 (Fri, 27 Mar 2009) | 2 lines
  
  Remove a cast that is not needed.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/bridges/bridge_softmix.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/bridges/bridge_softmix.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/bridges/bridge_softmix.c?view=diff&rev=184650&r1=184649&r2=184650
==============================================================================
--- branches/1.6.2/bridges/bridge_softmix.c (original)
+++ branches/1.6.2/bridges/bridge_softmix.c Fri Mar 27 09:22:25 2009
@@ -199,7 +199,7 @@
 /*! \brief Function which acts as the mixing thread */
 static int softmix_bridge_thread(struct ast_bridge *bridge)
 {
-	int timingfd = (unsigned short)(unsigned long)bridge->bridge_pvt;
+	int timingfd = (unsigned long)bridge->bridge_pvt;
 
 	ast_timer_set_rate(timingfd, (1000 / SOFTMIX_INTERVAL));