r2621 - trunk/libminisip/include/libminisip/rtp

[werner at minisip.org]

Author: werner
Date: 2006-06-04 13:27:55 +0200 (Sun, 04 Jun 2006)
New Revision: 2621

Modified:
   trunk/libminisip/include/libminisip/rtp/RtpPacket.h
Log:
Remove ZRTP guard. RTP has to support extension headers, regardless of ZRTP, thus this is a bug fix for RTP.

Modified: trunk/libminisip/include/libminisip/rtp/RtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/rtp/RtpPacket.h	2006-06-04 11:20:49 UTC (rev 2620)
+++ trunk/libminisip/include/libminisip/rtp/RtpPacket.h	2006-06-04 11:27:55 UTC (rev 2621)
@@ -1,3 +1,4 @@
+<<<<<<< .mine
 /*
  Copyright (C) 2004-2006 the Minisip Team
  
@@ -46,7 +47,8 @@
 class LIBMINISIP_API RtpPacket: public MObject {
 	public:
 		RtpPacket();
-		RtpPacket(unsigned char *content, int content_length, int seq_no, unsigned timestamp, unsigned ssrc);
+		RtpPacket(unsigned char *content, int content_length, int seq_no, 
+                          unsigned timestamp, unsigned ssrc);
 		RtpPacket(RtpHeader hdr, unsigned char *content, int content_length);
 		virtual ~RtpPacket();
 		
@@ -58,7 +60,6 @@
 
 		unsigned char *getContent();
 		int getContentLength();
-#ifdef ZRTP_SUPPORT
 		/**
 		 * Get length of extension header in bytes (not in words).
 		 *
@@ -67,7 +68,7 @@
 		 */
 		int getExtensionLength() { return extensionLength; };
 
-		/*
+		/**
 		 * Get pointer to extension header data.
 		 *
 		 * The pointer is returned as unsigned char because the extension
@@ -78,7 +79,7 @@
 		 */
 		unsigned char* getExtensionHeader() { return extensionHeader; };
 
-		/*
+		/**
 		 * Set extension header for this RTP packet.
 		 *
 		 * This method prepends the extension header to data thay may already
@@ -91,7 +92,6 @@
 		 *    Length of extension header data in bytes.
 		 */
 		void setExtHeader(unsigned char* data, int length);
-#endif // ZRTP_SUPPORT
 
 #ifdef DEBUG_OUTPUT
 		void printDebug();
@@ -105,10 +105,8 @@
 		RtpHeader header;
 		int content_length;
 		unsigned char *content;
-#ifdef ZRTP_SUPPORT
 		int extensionLength;
 		unsigned char* extensionHeader;
-#endif
 };
  
 #endif