diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 16:57:47 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 16:57:47 +0000 |
| commit | f0c105c91479a6d63d65f61c20b6fd1017daf076 (patch) | |
| tree | cbf5084c438942cc8953401b166774fde18f8af6 | |
| parent | 8578591bbf5084687f2f60289d2f1445e341dd7e (diff) | |
Re #1474: merged r4095:4099
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4100 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/jbuf.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/stream.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/jbuf.c b/pjmedia/src/pjmedia/jbuf.c index 6e2edad3..94a88c15 100644 --- a/pjmedia/src/pjmedia/jbuf.c +++ b/pjmedia/src/pjmedia/jbuf.c @@ -167,7 +167,7 @@ struct pjmedia_jbuf /* Enabling this would log the jitter buffer state about once per * second. */ -#if 0 +#if 1 # define TRACE__(args) PJ_LOG(5,args) #else # define TRACE__(args) diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index 983f0445..667ce044 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -943,7 +943,7 @@ static pj_status_t send_rtcp(pjmedia_stream *stream, pj_memcpy(pkt, sr_rr_pkt, len); max_len = stream->out_rtcp_pkt_size; } else { - pkt = sr_rr_pkt; + pkt = (pj_uint8_t*)sr_rr_pkt; max_len = len; } |