diff -ur a/avidemux/ADM_gui2/GUI_accelRender.h b/avidemux/ADM_gui2/GUI_accelRender.h --- a/avidemux/ADM_gui2/GUI_accelRender.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_gui2/GUI_accelRender.h 2006-06-25 15:39:14.000000000 -0300 @@ -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 -ur a/avidemux/ADM_inpics/ADM_pics.h b/avidemux/ADM_inpics/ADM_pics.h --- a/avidemux/ADM_inpics/ADM_pics.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_inpics/ADM_pics.h 2006-06-25 15:37:43.000000000 -0300 @@ -44,9 +44,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 -ur a/avidemux/ADM_mpegdemuxer/dmx_demuxerPS.h b/avidemux/ADM_mpegdemuxer/dmx_demuxerPS.h --- a/avidemux/ADM_mpegdemuxer/dmx_demuxerPS.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_mpegdemuxer/dmx_demuxerPS.h 2006-06-25 15:37:43.000000000 -0300 @@ -95,7 +95,7 @@ read(&r,1); return r; } -uint16_t dmx_demuxerPS::read16i(void) +uint16_t read16i(void) { uint16_t r; uint8_t p[2]; @@ -112,7 +112,7 @@ r=(p[0]<<8)+p[1]; return r; } -uint32_t dmx_demuxerPS::read32i(void) +uint32_t read32i(void) { uint32_t r; uint8_t *p; diff -ur a/avidemux/ADM_mpegdemuxer/dmx_demuxerTS.h b/avidemux/ADM_mpegdemuxer/dmx_demuxerTS.h --- a/avidemux/ADM_mpegdemuxer/dmx_demuxerTS.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_mpegdemuxer/dmx_demuxerTS.h 2006-06-25 15:37:43.000000000 -0300 @@ -108,7 +108,7 @@ read(&r,1); return r; } -uint16_t dmx_demuxerTS::read16i(void) +uint16_t read16i(void) { uint16_t r; uint8_t p[2]; @@ -125,7 +125,7 @@ r=(p[0]<<8)+p[1]; return r; } -uint32_t dmx_demuxerTS::read32i(void) +uint32_t read32i(void) { uint32_t r; uint8_t *p; diff -ur a/avidemux/ADM_mpegdemuxer/dmx_io.h b/avidemux/ADM_mpegdemuxer/dmx_io.h --- a/avidemux/ADM_mpegdemuxer/dmx_io.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_mpegdemuxer/dmx_io.h 2006-06-25 15:37:43.000000000 -0300 @@ -64,7 +64,7 @@ #else -uint32_t fileParser::read32i(void ) +uint32_t read32i(void ) { uint32_t v; uint8_t c[4]; @@ -84,7 +84,7 @@ v= (p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; return v; } -uint16_t fileParser::read16i(void ) +uint16_t read16i(void ) { uint32_t v; uint8_t c[4]; @@ -104,7 +104,7 @@ v= (p[0]<<8)+p[1]; return v; } -uint8_t fileParser::read8i(void ) +uint8_t read8i(void ) { uint8_t r; if(_off<_tail) diff -ur a/avidemux/ADM_video/ADM_vidDecDec.cpp b/avidemux/ADM_video/ADM_vidDecDec.cpp --- a/avidemux/ADM_video/ADM_vidDecDec.cpp 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_video/ADM_vidDecDec.cpp 2006-06-25 15:37:43.000000000 -0300 @@ -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 -ur a/avidemux/ADM_video/ADM_vidDecTelecide.h b/avidemux/ADM_video/ADM_vidDecTelecide.h --- a/avidemux/ADM_video/ADM_vidDecTelecide.h 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_video/ADM_vidDecTelecide.h 2006-06-25 15:37:43.000000000 -0300 @@ -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 -ur a/avidemux/ADM_video/ADM_vidDGbob.cpp b/avidemux/ADM_video/ADM_vidDGbob.cpp --- a/avidemux/ADM_video/ADM_vidDGbob.cpp 2006-06-25 15:37:36.000000000 -0300 +++ b/avidemux/ADM_video/ADM_vidDGbob.cpp 2006-06-25 15:37:43.000000000 -0300 @@ -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);