aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_bridge.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-02 17:20:52 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-02 17:20:52 +0000
commit0eb1480fe02b28de9d0d67bbd8779d7296639cc1 (patch)
tree8a8042738e1c444e5988a648b795c4d2b02febd1 /channels/chan_bridge.c
parent889f2ce31ec2f6cda98ecbc9681b883b7384fa2c (diff)
Merge in the RTP engine API.
This API provides a generic way for multiple RTP stacks to be integrated into Asterisk. Right now there is only one present, res_rtp_asterisk, which is the existing Asterisk RTP stack. Functionality wise this commit performs the same as previously. API documentation can be viewed in the rtp_engine.h header file. Review: http://reviewboard.digium.com/r/209/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@186078 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_bridge.c')
-rw-r--r--channels/chan_bridge.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_bridge.c b/channels/chan_bridge.c
index 84909e795..bd1d0fbee 100644
--- a/channels/chan_bridge.c
+++ b/channels/chan_bridge.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
-#include "asterisk/rtp.h"
#include "asterisk/acl.h"
#include "asterisk/callerid.h"
#include "asterisk/file.h"