Index: pjproject/trunk/pjmedia/include/pjmedia/rtcp.h
===================================================================
--- pjproject/trunk/pjmedia/include/pjmedia/rtcp.h	(revision 188)
+++ pjproject/trunk/pjmedia/include/pjmedia/rtcp.h	(revision 321)
@@ -40,5 +40,5 @@
  * RTCP sender report.
  */
-struct pj_rtcp_sr
+struct pjmedia_rtcp_sr
 {
     pj_uint32_t	    ssrc;	    /**< SSRC identification.		*/
@@ -51,12 +51,12 @@
 
 /**
- * @see pj_rtcp_sr
- */
-typedef struct pj_rtcp_sr pj_rtcp_sr;
+ * @see pjmedia_rtcp_sr
+ */
+typedef struct pjmedia_rtcp_sr pjmedia_rtcp_sr;
 
 /**
  * RTCP receiver report.
  */
-struct pj_rtcp_rr
+struct pjmedia_rtcp_rr
 {
     pj_uint32_t	    ssrc;	    /**< SSRC identification.		*/
@@ -79,7 +79,7 @@
 
 /**
- * @see pj_rtcp_rr
- */
-typedef struct pj_rtcp_rr pj_rtcp_rr;
+ * @see pjmedia_rtcp_rr
+ */
+typedef struct pjmedia_rtcp_rr pjmedia_rtcp_rr;
 
 
@@ -87,5 +87,5 @@
  * RTCP common header.
  */
-struct pj_rtcp_common
+struct pjmedia_rtcp_common
 {
 #if defined(PJ_IS_BIG_ENDIAN) && PJ_IS_BIG_ENDIAN!=0
@@ -104,22 +104,22 @@
 
 /**
- * @see pj_rtcp_common
- */
-typedef struct pj_rtcp_common pj_rtcp_common;
+ * @see pjmedia_rtcp_common
+ */
+typedef struct pjmedia_rtcp_common pjmedia_rtcp_common;
 
 /**
  * RTCP packet.
  */
-struct pj_rtcp_pkt
-{
-    pj_rtcp_common  common;	/**< Common header.	    */
-    pj_rtcp_sr	    sr;		/**< Sender report.	    */
-    pj_rtcp_rr	    rr;		/**< variable-length list   */
-};
-
-/**
- * @see pj_rtcp_pkt
- */
-typedef struct pj_rtcp_pkt pj_rtcp_pkt;
+struct pjmedia_rtcp_pkt
+{
+    pjmedia_rtcp_common  common;	/**< Common header.	    */
+    pjmedia_rtcp_sr sr;		/**< Sender report.	    */
+    pjmedia_rtcp_rr rr;		/**< variable-length list   */
+};
+
+/**
+ * @see pjmedia_rtcp_pkt
+ */
+typedef struct pjmedia_rtcp_pkt pjmedia_rtcp_pkt;
 
 
@@ -127,5 +127,5 @@
  * NTP time representation.
  */
-struct pj_rtcp_ntp_rec
+struct pjmedia_rtcp_ntp_rec
 {
     pj_uint32_t	    hi;		/**< High order 32-bit part.	*/
@@ -134,7 +134,7 @@
 
 /**
- * @see pj_rtcp_ntp_rec
- */
-typedef struct pj_rtcp_ntp_rec pj_rtcp_ntp_rec;
+ * @see pjmedia_rtcp_ntp_rec
+ */
+typedef struct pjmedia_rtcp_ntp_rec pjmedia_rtcp_ntp_rec;
 
 
@@ -143,7 +143,7 @@
  * RTCP session.
  */
-struct pj_rtcp_session
-{
-    pj_rtcp_pkt	    rtcp_pkt;	    /**< Cached RTCP packet.		    */
+struct pjmedia_rtcp_session
+{
+    pjmedia_rtcp_pkt	    rtcp_pkt;	/**< Cached RTCP packet.	    */
     
     pjmedia_rtp_seq_session seq_ctrl;	/**< RTCP sequence number control.  */
@@ -155,14 +155,14 @@
     pj_uint32_t	    jitter;	    /**< Estimated jitter		    */
     
-    pj_rtcp_ntp_rec rtcp_lsr;	    /**< NTP ts in last SR received	    */
-    unsigned 	    rtcp_lsr_time;  /**< Time when last SR is received.	    */
-    pj_uint32_t	    peer_ssrc;	    /**< Peer SSRC			    */
+    pjmedia_rtcp_ntp_rec rtcp_lsr;	 /**< NTP ts in last SR received    */
+    unsigned 		 rtcp_lsr_time;  /**< Time when last SR is received.*/
+    pj_uint32_t		 peer_ssrc;	 /**< Peer SSRC			    */
     
 };
 
 /**
- * @see pj_rtcp_session
- */
-typedef struct pj_rtcp_session pj_rtcp_session;
+ * @see pjmedia_rtcp_session
+ */
+typedef struct pjmedia_rtcp_session pjmedia_rtcp_session;
 
 
@@ -173,5 +173,6 @@
  * @param ssrc	    The SSRC used in to identify the session.
  */
-PJ_DECL(void) pj_rtcp_init( pj_rtcp_session *session, pj_uint32_t ssrc );
+PJ_DECL(void) pjmedia_rtcp_init( pjmedia_rtcp_session *session, 
+				 pj_uint32_t ssrc );
 
 
@@ -181,5 +182,5 @@
  * @param session   The session.
  */
-PJ_DECL(void) pj_rtcp_fini( pj_rtcp_session *session);
+PJ_DECL(void) pjmedia_rtcp_fini( pjmedia_rtcp_session *session);
 
 
@@ -192,6 +193,7 @@
  * @param ts	    The RTP packet timestamp, in host byte order.
  */
-PJ_DECL(void) pj_rtcp_rx_rtp( pj_rtcp_session *session, pj_uint16_t seq, 
-			      pj_uint32_t ts );
+PJ_DECL(void) pjmedia_rtcp_rx_rtp( pjmedia_rtcp_session *session, 
+				   pj_uint16_t seq, 
+				   pj_uint32_t ts );
 
 
@@ -204,5 +206,6 @@
  *		    RTP header) in bytes.
  */
-PJ_DECL(void) pj_rtcp_tx_rtp( pj_rtcp_session *session, pj_uint16_t ptsize );
+PJ_DECL(void) pjmedia_rtcp_tx_rtp( pjmedia_rtcp_session *session, 
+				   pj_uint16_t ptsize );
 
 
@@ -216,7 +219,7 @@
  *		    the RTCP packet.
  */
-PJ_DECL(void) pj_rtcp_build_rtcp( pj_rtcp_session *session, 
-				  pj_rtcp_pkt **rtcp_pkt, 
-				  int *len );
+PJ_DECL(void) pjmedia_rtcp_build_rtcp( pjmedia_rtcp_session *session, 
+				       pjmedia_rtcp_pkt **rtcp_pkt, 
+				       int *len );
 
 
