summaryrefslogtreecommitdiff
path: root/channels/chan_bridge.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2009-04-02 17:20:52 +0000
committerJoshua Colp <jcolp@digium.com>2009-04-02 17:20:52 +0000
commit63de8343958b91c8836c5e6ddf1c0106b40e9fe6 (patch)
tree8a8042738e1c444e5988a648b795c4d2b02febd1 /channels/chan_bridge.c
parent08971ce2056f4e035b4b37324c7f184370cd0ec6 (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: https://origsvn.digium.com/svn/asterisk/trunk@186078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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"