diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/cae.h --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/cae.h 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/cae.h 2005-12-20 04:23:45.751472750 +0100 @@ -52,8 +52,8 @@ class CInBitStream; class arcodec { public: - arcodec::~arcodec () {}; - arcodec::arcodec () {}; + ~arcodec () {}; + arcodec () {}; UInt L; /* lower bound */ UInt R; /* code range */ UInt V; /* current code value */ diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/dataStruct.hpp --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/dataStruct.hpp 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/dataStruct.hpp 2005-12-20 04:29:19.672341500 +0100 @@ -1033,7 +1033,7 @@ 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, diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/grayc.hpp --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/grayc.hpp 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/grayc.hpp 2005-12-20 04:21:36.879418750 +0100 @@ -94,7 +94,7 @@ 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 @@ Int iExpandYRefFrame, Bool bShapeOnly ) const; - own CU8Image* CU8Image::upsampleSegForSpatialScalability ( Int iVerticalSamplingFactorM, + own CU8Image* upsampleSegForSpatialScalability ( Int iVerticalSamplingFactorM, Int iVerticalSamplingFactorN, Int iHorizontalSamplingFactorM, Int iHorizontalSamplingFactorN, diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/newpred.hpp --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/newpred.hpp 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/newpred.hpp 2005-12-20 04:25:09.540709250 +0100 @@ -116,7 +116,7 @@ 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 @@ 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, ... ); diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopseenc.hpp --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopseenc.hpp 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopseenc.hpp 2005-12-20 04:27:38.902043750 +0100 @@ -370,13 +370,13 @@ 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 @@ Bool bColocatedMBExist ); // for spatial scalability only - Int CVideoObjectEncoder::motionEstMB_BVOP( + Int motionEstMB_BVOP( CoordI x, CoordI y, CMotionVector* pmvForward, CMotionVector* pmvBackward, CMBMode* pmbmd, diff -Naur mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopses.hpp --- mpeg4ip-1.4.1/common/video/iso-mpeg4/include/vopses.hpp 2005-05-04 21:55:58.000000000 +0200 +++ mpeg4ip-1.4.1-gcc41/common/video/iso-mpeg4/include/vopses.hpp 2005-12-20 04:22:01.836978500 +0100 @@ -807,7 +807,7 @@ // ~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);