faad port and patches needed to build on -current

[Sean McNeil]

I recently tried to build faad and couldn't because there are some
virtual functions defined and set to NULL instead of 0.  The following 2
patches allowed me to compile (included as text and attached):

files/patch-mp4property.h:
*** common/mp4v2/mp4property.h.orig	Tue Oct  5 13:41:26 2004
--- common/mp4v2/mp4property.h	Tue Oct  5 13:42:25 2004
*************** public:
*** 58,64 ****
  		return m_name;
  	}
  
! 	virtual MP4PropertyType GetType() = NULL; 
  
  	bool IsReadOnly() {
  		return m_readOnly;
--- 58,64 ----
  		return m_name;
  	}
  
! 	virtual MP4PropertyType GetType() = 0; 
  
  	bool IsReadOnly() {
  		return m_readOnly;
*************** public:
*** 74,90 ****
  		m_implicit = value;
  	}
  
! 	virtual u_int32_t GetCount() = NULL;
! 	virtual void SetCount(u_int32_t count) = NULL;
  
  	virtual void Generate() { /* default is a no-op */ };
  
! 	virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
  
! 	virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
  
  	virtual void Dump(FILE* pFile, u_int8_t indent,
! 		bool dumpImplicits, u_int32_t index = 0) = NULL;
  
  	virtual bool FindProperty(const char* name,
  		MP4Property** ppProperty, u_int32_t* pIndex = NULL);
--- 74,90 ----
  		m_implicit = value;
  	}
  
! 	virtual u_int32_t GetCount() = 0;
! 	virtual void SetCount(u_int32_t count) = 0;
  
  	virtual void Generate() { /* default is a no-op */ };
  
! 	virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
  
! 	virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
  
  	virtual void Dump(FILE* pFile, u_int8_t indent,
! 		bool dumpImplicits, u_int32_t index = 0) = 0;
  
  	virtual bool FindProperty(const char* name,
  		MP4Property** ppProperty, u_int32_t* pIndex = NULL);

files/patch-rtphint.h:

*** common/mp4v2/rtphint.h.orig	Tue Oct  5 13:46:32 2004
--- common/mp4v2/rtphint.h	Tue Oct  5 13:46:49 2004
*************** public:
*** 35,42 ****
  		return m_pPacket;
  	}
  
! 	virtual u_int16_t GetDataSize() = NULL;
! 	virtual void GetData(u_int8_t* pDest) = NULL;
  
  	MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
  
--- 35,42 ----
  		return m_pPacket;
  	}
  
! 	virtual u_int16_t GetDataSize() = 0;
! 	virtual void GetData(u_int8_t* pDest) = 0;
  
  	MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
  

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20041005/e520ead2/attachment.bin