SOURCES: mpeg4ip-gcc4.patch (NEW) - build fixes.

[pluto]

Author: pluto                        Date: Thu Dec  1 17:13:32 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- build fixes.

---- Files affected:
SOURCES:
   mpeg4ip-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mpeg4ip-gcc4.patch
diff -u /dev/null SOURCES/mpeg4ip-gcc4.patch:1.1
--- /dev/null	Thu Dec  1 18:13:32 2005
+++ SOURCES/mpeg4ip-gcc4.patch	Thu Dec  1 18:13:27 2005
@@ -0,0 +1,104 @@
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h	2005-12-01 14:58:45.996977500 +0100
+@@ -52,8 +52,8 @@ class COutBitStream;
+ class CInBitStream;
+ class arcodec {
+ public:
+-	arcodec::~arcodec () {};
+-	arcodec::arcodec () {};
++	~arcodec () {};
++	arcodec () {};
+ 	UInt L; /* lower bound */
+ 	UInt R; /* code range */
+ 	UInt V; /* current code value */
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp	2005-12-01 16:49:21.176320750 +0100
+@@ -1033,7 +1033,7 @@ public:
+ 	Void write_image_tile(Char *recImgFile, UChar **frm);
+ 
+ // FPDAM begin: modified by Sharp
+-	Void CVTCDecoder::write_image_to_buffer(UChar **DstImage, 
++	Void write_image_to_buffer(UChar **DstImage, 
+ 		UChar *DstMask[3], // FPDAM added by Sharp
+ 		Int DstWidth, Int DstHeight, Int iTile, Int TileW,
+ 		/* Char *recImgFile,*/ Int colors,
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp	2005-12-01 14:57:41.068919750 +0100
+@@ -94,7 +94,7 @@ public:
+ 	own CU8Image* biInterpolate () const; // bilinearly interpolate 
+ 	own CU8Image* downsampleForSpatialScalability () const;
+ //OBSS_SAIT_991015
+-	own CU8Image* CU8Image::upsampleForSpatialScalability (	Int iVerticalSamplingFactorM,
++	own CU8Image* upsampleForSpatialScalability (	Int iVerticalSamplingFactorM,
+ 															Int iVerticalSamplingFactorN,
+ 															Int iHorizontalSamplingFactorM,
+ 															Int iHorizontalSamplingFactorN,
+@@ -104,7 +104,7 @@ public:
+ 															Int iExpandYRefFrame,
+ 															Bool bShapeOnly		
+ 															) const;
+-	own CU8Image* CU8Image::upsampleSegForSpatialScalability (	Int iVerticalSamplingFactorM,
++	own CU8Image* upsampleSegForSpatialScalability (	Int iVerticalSamplingFactorM,
+ 															Int iVerticalSamplingFactorN,
+ 															Int iHorizontalSamplingFactorM,
+ 															Int iHorizontalSamplingFactorN,
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp	2005-12-01 14:59:55.569325500 +0100
+@@ -116,7 +116,7 @@ public:
+ 	virtual ~CNewPred();
+ 
+ 	Bool	CheckSlice(int iMBX, int iMBY, Bool bChkTop = TRUE);
+-	int		CNewPred::GetSliceNum(int iMBX, int iMBY);
++	int		GetSliceNum(int iMBX, int iMBY);
+ 	int		NextSliceHeadMBA(int iMBX, int iMBY);
+ 	int		GetCurrentVOP_id();
+ 
+@@ -205,7 +205,7 @@ public:
+ 	void	GetSlicePoint(char * pchSlicePointParam);
+ 	int		getwidth(){return(m_iWidth);}
+ 
+-	int CNewPred::SliceTailMBA(int iMBX, int iMBY);
++	int	SliceTailMBA(int iMBX, int iMBY);
+ 
+ #ifdef _DEBUG
+ 	void cdecl NPDebugMessage( char* pszMsg, ... );
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp	2005-12-01 16:45:15.512967750 +0100
+@@ -370,13 +370,13 @@ protected:
+ 	Void ThreeTapFilter(PixelC *pLow, PixelC *pHight,
+ 		Int iwidth, Int iheight);
+ 	Int DeltaMP(Double *dA, Int in, Double *db, Double *dm);
+-	Int CVideoObjectEncoder::globalme(CoordI iXCurr, CoordI iYCurr,
++	Int globalme(CoordI iXCurr, CoordI iYCurr,
+ 					PixelC *pref);
+-	Void CVideoObjectEncoder::StationalWarpME(Int iXCurr, Int iYCurr,
++	Void StationalWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+-	Void CVideoObjectEncoder::TranslationalWarpME(Int iXCurr, Int iYCurr,
++	Void TranslationalWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+-	Void CVideoObjectEncoder::FastAffineWarpME(Int iXCurr, Int iYCurr,
++	Void FastAffineWarpME(Int iXCurr, Int iYCurr,
+ 		PixelC* pref, Int& iSumofAD);
+ 	// ~GMC
+ 
+@@ -680,7 +680,7 @@ protected:
+ 		Bool bColocatedMBExist
+ 	);
+ 	// for spatial scalability only
+-	Int CVideoObjectEncoder::motionEstMB_BVOP(
++	Int motionEstMB_BVOP(
+ 		CoordI x, CoordI y, 
+ 		CMotionVector* pmvForward, CMotionVector* pmvBackward,
+ 		CMBMode* pmbmd,
+--- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp.orig	2005-05-04 21:55:58.000000000 +0200
++++ mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp	2005-12-01 14:58:07.798590250 +0100
+@@ -807,7 +807,7 @@ protected:
+ 	// ~GMC
+ 
+ // RRV insertion
+-	Void	CVideoObject::filterCodedPictureForRRV(PixelC*, PixelC*, PixelC*, 
++	Void	filterCodedPictureForRRV(PixelC*, PixelC*, PixelC*, 
+ 												   Int isizex, Int isizey,
+ 												   Int inumMBx,Int inumMBy, 
+ 												   Int iwidthY, Int iwidthUV);
================================================================