diff options
| author | Steve Murphy <murf@digium.com> | 2007-06-22 15:15:35 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-06-22 15:15:35 +0000 |
| commit | 6a2af3c983c9f7f8aa251c9ff6d5fe39faa43e8b (patch) | |
| tree | ddd9eecf189aee9b4a098ee86568ff1d9bfacad2 /main/rtp.c | |
| parent | 68ac7f76332fd8ca371c4047a60e87073f8ef50a (diff) | |
Merged revisions 71063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r71063 | murf | 2007-06-22 08:10:24 -0600 (Fri, 22 Jun 2007) | 1 line
My conditions for merging amaflags info was naive; DOCUMENTATION is the default, although null is possible; theft of user-settable fields is not good. Just copy them, leave them alone.
This is for bug 10016. (plus a small fix to rtp, to elim a compiler warning (dev mode))
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c index de2308efd..bd117fd27 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1050,7 +1050,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) "IAJitter: %u\r\n" "LastSR: %lu.%010lu\r\n" "DLSR: %4.4f(sec)\r\n" - "RTT: %lu(sec)\r\n", + "RTT: %llu(sec)\r\n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), pt, (pt == 200) ? "Sender Report" : (pt == 201) ? "Receiver Report" : (pt == 192) ? "H.261 FUR" : "Unknown", rc, |