diff -urN avidemux-2.0.42.orig/avidemux/ADM_audiocodec/ADM_codecfaad.cpp avidemux-2.0.42/avidemux/ADM_audiocodec/ADM_codecfaad.cpp
--- avidemux-2.0.42.orig/avidemux/ADM_audiocodec/ADM_codecfaad.cpp	2006-07-31 20:11:52.681032750 +0000
+++ avidemux-2.0.42/avidemux/ADM_audiocodec/ADM_codecfaad.cpp	2006-07-31 21:34:02.017097000 +0000
@@ -28,6 +28,8 @@
 #include "ADM_audiocodec/ADM_audiocodec.h"
 #include "faad.h"
 
+#undef OLD_FAAD_PROTO
+
 static uint32_t xin,xout;
 
 ADM_faad::ADM_faad( uint32_t fourcc ,WAVHeader *info,uint32_t l,uint8_t *d) :   ADM_Audiocodec(fourcc)
diff -urN avidemux-2.0.42.orig/avidemux/ADM_gui2/GUI_accelRender.h avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h
--- avidemux-2.0.42.orig/avidemux/ADM_gui2/GUI_accelRender.h	2006-07-31 20:11:53.317072500 +0000
+++ avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h	2006-07-31 21:33:33.283301250 +0000
@@ -12,7 +12,7 @@
 class AccelRender
 {
 	public:
-		AccelRender::AccelRender( void);
+		AccelRender( void);
 		virtual	uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;
 		virtual	uint8_t end(void)=0;
 		virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;
diff -urN avidemux-2.0.42.orig/avidemux/ADM_inpics/ADM_pics.h avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h
--- avidemux-2.0.42.orig/avidemux/ADM_inpics/ADM_pics.h	2006-07-31 20:11:53.369075750 +0000
+++ avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h	2006-07-31 21:33:33.283301250 +0000
@@ -38,9 +38,9 @@
 
 					uint32_t 		_type;
 
-					uint32_t    picHeader::read32(FILE *fd);
-					uint16_t    picHeader::read16(FILE *fd);
-					uint8_t    picHeader::read8(FILE *fd);
+					uint32_t    read32(FILE *fd);
+					uint16_t    read16(FILE *fd);
+					uint8_t    read8(FILE *fd);
 
 public:
 //  static int checkFourCC(uint8_t *in, uint8_t *fourcc);
diff -urN avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDecDec.cpp avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp
--- avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDecDec.cpp	2006-07-31 20:11:54.233129750 +0000
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp	2006-07-31 21:33:33.283301250 +0000
@@ -147,8 +147,8 @@
 	
 public:
 				
-			Decimate::Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);    
-			Decimate::~Decimate(void);
+			Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);    
+			~Decimate(void);
 	uint8_t  	getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
 				ADMImage *data,uint32_t *flags);
 
diff -urN avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDecTelecide.h avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h
--- avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDecTelecide.h	2006-07-31 20:11:54.241130250 +0000
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h	2006-07-31 21:33:33.287301500 +0000
@@ -112,32 +112,32 @@
 
 public:
 	
-	void Telecide::CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, 
+	void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, 
 				unsigned char *prp, unsigned char *prpU, unsigned char *prpV);
-	void Telecide::Show(ADMImage *dst, int frame);
-	void Telecide::Debug(int frame);
+	void Show(ADMImage *dst, int frame);
+	void Debug(int frame);
 
-	Telecide::Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);		
+	Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);		
 			
-	Telecide::~Telecide();
+	~Telecide();
 
-	void Telecide::PutChosen(int frame, unsigned int chosen);
+	void PutChosen(int frame, unsigned int chosen);
 	
 
-	void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock,
+	void CacheInsert(int frame, unsigned int p, unsigned int pblock,
 				unsigned int c, unsigned int cblock);
 	
-	bool Telecide::CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
+	bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
 				unsigned int *c, unsigned int *cblock);	
 
-	bool Telecide::PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
+	bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
 	
-	struct PREDICTION *Telecide::PredictSoftYUY2(int frame);
+	struct PREDICTION *PredictSoftYUY2(int frame);
 
-	void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern);
-	virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
+	void WriteHints(unsigned char *dst, bool film, bool inpattern);
+	virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
 				ADMImage *data,uint32_t *flags);
-	char *Telecide::printConf( void );
-	uint8_t Telecide::configure(AVDMGenericVideoStream *in);
-	uint8_t	Telecide::getCoupledConf( CONFcouple **couples);
+	char *printConf( void );
+	uint8_t configure(AVDMGenericVideoStream *in);
+	uint8_t	getCoupledConf( CONFcouple **couples);
 };
diff -urN avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDGbob.cpp avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp
--- avidemux-2.0.42.orig/avidemux/ADM_video/ADM_vidDGbob.cpp	2006-07-31 20:11:53.797102500 +0000
+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp	2006-07-31 21:33:33.287301500 +0000
@@ -55,8 +55,8 @@
         void            update(void); 
 public:
                                 
-                        DGbob::DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);    
-                        DGbob::~DGbob(void);
+                        DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);    
+                        ~DGbob(void);
         uint8_t         getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
                                 ADMImage *data,uint32_t *flags);