From: Olle Johansson Date: Wed, 30 Jan 2008 16:39:14 +0000 (+0000) Subject: - doxygen fixes X-Git-Tag: 1.6.0-beta3~2^2~129 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94325433a278ea0559c86580bb4e92cd1eb1cd83;p=thirdparty%2Fasterisk.git - doxygen fixes - change function to void because it always returned the same value and no one read it. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101268 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index 003ff268fa..8d853903b2 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -262,13 +262,13 @@ void ast_rtp_init(void); /*! Initialize RTP int ast_rtp_reload(void); /*! reload rtp configuration */ void ast_rtp_new_init(struct ast_rtp *rtp); -/*! Set codec preference */ -int ast_rtp_codec_setpref(struct ast_rtp *rtp, struct ast_codec_pref *prefs); +/*! \brief Set codec preference */ +void ast_rtp_codec_setpref(struct ast_rtp *rtp, struct ast_codec_pref *prefs); -/*! Get codec preference */ +/*! \brief Get codec preference */ struct ast_codec_pref *ast_rtp_codec_getpref(struct ast_rtp *rtp); -/*! get format from predefined dynamic payload format */ +/*! \brief get format from predefined dynamic payload format */ int ast_rtp_codec_getformat(int pt); /*! \brief Set rtp timeout */ diff --git a/main/rtp.c b/main/rtp.c index 5d707e6bb5..b514d33eb5 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1798,7 +1798,6 @@ static struct ast_rtp_protocol *get_proto(struct ast_channel *chan) int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1) { - // dest = c0, src = c1 struct ast_rtp *destp = NULL, *srcp = NULL; /* Audio RTP Channels */ struct ast_rtp *vdestp = NULL, *vsrcp = NULL; /* Video RTP channels */ struct ast_rtp *tdestp = NULL, *tsrcp = NULL; /* Text RTP channels */ @@ -2034,8 +2033,6 @@ void ast_rtp_get_current_formats(struct ast_rtp* rtp, } rtp_bridge_unlock(rtp); - - return; } struct rtpPayloadType ast_rtp_lookup_pt(struct ast_rtp* rtp, int pt) @@ -2217,8 +2214,6 @@ void ast_rtp_new_init(struct ast_rtp *rtp) rtp->seqno = ast_random() & 0xffff; ast_set_flag(rtp, FLAG_HAS_DTMF); rtp->strict_rtp_state = (strictrtp ? STRICT_RTP_LEARN : STRICT_RTP_OPEN); - - return; } struct ast_rtp *ast_rtp_new_with_bindaddr(struct sched_context *sched, struct io_context *io, int rtcpenable, int callbackmode, struct in_addr addr) @@ -3086,7 +3081,7 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec return 0; } -int ast_rtp_codec_setpref(struct ast_rtp *rtp, struct ast_codec_pref *prefs) +void ast_rtp_codec_setpref(struct ast_rtp *rtp, struct ast_codec_pref *prefs) { int x; for (x = 0; x < 32; x++) { /* Ugly way */ @@ -3096,7 +3091,6 @@ int ast_rtp_codec_setpref(struct ast_rtp *rtp, struct ast_codec_pref *prefs) if (rtp->smoother) ast_smoother_free(rtp->smoother); rtp->smoother = NULL; - return 0; } struct ast_codec_pref *ast_rtp_codec_getpref(struct ast_rtp *rtp) @@ -3518,8 +3512,6 @@ static void p2p_set_bridge(struct ast_rtp *rtp0, struct ast_rtp *rtp1) rtp_bridge_lock(rtp0); rtp0->bridged = rtp1; rtp_bridge_unlock(rtp0); - - return; } /*! \brief Bridge loop for partial native bridge (packet2packet)