aboutsummaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-27 14:22:25 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-27 14:22:25 +0000
commit8eda72ba2768d1af14b65fca6151d4202b8da48c (patch)
tree63012caa6806261dd728bde0ae87bea13115f3a8 /bridges
parent475a33042c9020417d6d8c9f247063484f7f18f3 (diff)
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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184650 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 73ac29660..953dbb45a 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -199,7 +199,7 @@ static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_chan
/*! \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));