diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 16:46:27 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 16:46:27 +0000 |
| commit | 8578591bbf5084687f2f60289d2f1445e341dd7e (patch) | |
| tree | 457056f132b1bc70ea385c45ed3194612fd6604a /pjmedia | |
| parent | 89b6fc1d3eefbb59919af2e28f914d7e11c5794e (diff) | |
Misc (re #1446): Fixed compile errors on Symbian S60 5th Ed SDK: unrecognized a struct defined inside another struct and 64 bit integer constants suffix.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4099 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/clock_thread.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/vid_stream.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/clock_thread.c b/pjmedia/src/pjmedia/clock_thread.c index 39a77fa2..0ce78368 100644 --- a/pjmedia/src/pjmedia/clock_thread.c +++ b/pjmedia/src/pjmedia/clock_thread.c @@ -83,7 +83,7 @@ pjmedia_clock_src_get_time_msec( const pjmedia_clock_src *clocksrc ) pjmedia_clock_src_get_current_timestamp(clocksrc, &ts); #if PJ_HAS_INT64 - if (ts.u64 > 0x3FFFFFFFFFFFFFUL) + if (ts.u64 > 0x3FFFFFFFFFFFFFULL) return (pj_uint32_t)(ts.u64 / clocksrc->clock_rate * 1000); else return (pj_uint32_t)(ts.u64 * 1000 / clocksrc->clock_rate); diff --git a/pjmedia/src/pjmedia/vid_stream.c b/pjmedia/src/pjmedia/vid_stream.c index 1ce8185a..a1dc4e00 100644 --- a/pjmedia/src/pjmedia/vid_stream.c +++ b/pjmedia/src/pjmedia/vid_stream.c @@ -468,7 +468,7 @@ static pj_status_t send_rtcp(pjmedia_vid_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; } |