diff -Naur gephex-0.4.3.old/base/src/utils/structscanner.h gephex-0.4.3/base/src/utils/structscanner.h --- gephex-0.4.3.old/base/src/utils/structscanner.h 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/base/src/utils/structscanner.h 2006-04-30 18:06:08.000000000 -0400 @@ -40,11 +40,11 @@ { IStructTokenListener& m_listener; - void StructScanner::divideNameFromContent(const std::string& text, + void divideNameFromContent(const std::string& text, std::string& name, std::string& content) const; - void StructScanner::processName(const std::string& name) const; - void StructScanner::processContent(const std::string& content) const; + void processName(const std::string& name) const; + void processContent(const std::string& content) const; std::string::size_type findNextClosingBracket(const std::string& content, std::string::size_type n) const; diff -Naur gephex-0.4.3.old/contrib/ffmpeg/libavcodec/ac3.h gephex-0.4.3/contrib/ffmpeg/libavcodec/ac3.h --- gephex-0.4.3.old/contrib/ffmpeg/libavcodec/ac3.h 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/contrib/ffmpeg/libavcodec/ac3.h 2006-04-30 19:52:49.000000000 -0400 @@ -43,6 +43,7 @@ int cplfleak, cplsleak; } AC3BitAllocParameters; +#if 0 extern const uint16_t ac3_freqs[3]; extern const uint16_t ac3_bitratetab[19]; extern const int16_t ac3_window[256]; @@ -52,6 +53,7 @@ extern const uint16_t dbkneetab[4]; extern const uint16_t floortab[8]; extern const uint16_t fgaintab[8]; +#endif void ac3_common_init(void); void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, diff -Naur gephex-0.4.3.old/contrib/ffmpeg/libavcodec/avcodec.h gephex-0.4.3/contrib/ffmpeg/libavcodec/avcodec.h --- gephex-0.4.3.old/contrib/ffmpeg/libavcodec/avcodec.h 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/contrib/ffmpeg/libavcodec/avcodec.h 2006-04-30 19:52:49.000000000 -0400 @@ -1685,6 +1685,14 @@ #define FF_OPT_MAX_DEPTH 10 } AVOption; +struct AVOption; +#ifdef HAVE_MMX +extern const struct AVOption avoptions_common[3 + 5]; +#else +extern const struct AVOption avoptions_common[3]; +#endif +extern const struct AVOption avoptions_workaround_bug[11]; + /** * Parse option(s) and sets fields in passed structure * @param strct structure where the parsed results will be written diff -Naur gephex-0.4.3.old/contrib/ffmpeg/libavcodec/common.h gephex-0.4.3/contrib/ffmpeg/libavcodec/common.h --- gephex-0.4.3.old/contrib/ffmpeg/libavcodec/common.h 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/contrib/ffmpeg/libavcodec/common.h 2006-04-30 19:52:49.000000000 -0400 @@ -62,14 +62,6 @@ #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } #define AVOPTION_END() AVOPTION_SUB(NULL) -struct AVOption; -#ifdef HAVE_MMX -extern const struct AVOption avoptions_common[3 + 5]; -#else -extern const struct AVOption avoptions_common[3]; -#endif -extern const struct AVOption avoptions_workaround_bug[11]; - #endif /* HAVE_AV_CONFIG_H */ /* Suppress restrict if it was not defined in config.h. */ diff -Naur gephex-0.4.3.old/contrib/ffmpeg/libavcodec/i386/dsputil_mmx.c gephex-0.4.3/contrib/ffmpeg/libavcodec/i386/dsputil_mmx.c --- gephex-0.4.3.old/contrib/ffmpeg/libavcodec/i386/dsputil_mmx.c 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/contrib/ffmpeg/libavcodec/i386/dsputil_mmx.c 2006-04-30 19:52:49.000000000 -0400 @@ -672,26 +672,22 @@ "punpcklwd %%mm0, %%mm1 \n\t" "punpckhwd %%mm4, %%mm3 \n\t" "punpckhwd %%mm0, %%mm6 \n\t" - "movd %%mm5, %0 \n\t" - "punpckhdq %%mm5, %%mm5 \n\t" - "movd %%mm5, %1 \n\t" - "movd %%mm3, %2 \n\t" - "punpckhdq %%mm3, %%mm3 \n\t" - "movd %%mm3, %3 \n\t" - "movd %%mm1, %4 \n\t" - "punpckhdq %%mm1, %%mm1 \n\t" - "movd %%mm1, %5 \n\t" - "movd %%mm6, %6 \n\t" - "punpckhdq %%mm6, %%mm6 \n\t" - "movd %%mm6, %7 \n\t" - : "=m" (*(uint32_t*)(src + 0*stride)), - "=m" (*(uint32_t*)(src + 1*stride)), - "=m" (*(uint32_t*)(src + 2*stride)), - "=m" (*(uint32_t*)(src + 3*stride)), - "=m" (*(uint32_t*)(src + 4*stride)), - "=m" (*(uint32_t*)(src + 5*stride)), - "=m" (*(uint32_t*)(src + 6*stride)), - "=m" (*(uint32_t*)(src + 7*stride)) + "movd %%mm5, (%0) \n\t" + "punpckhdq %%mm5, %%mm5 \n\t" + "movd %%mm5, (%0,%2) \n\t" + "movd %%mm3, (%0,%2,2) \n\t" + "punpckhdq %%mm3, %%mm3 \n\t" + "movd %%mm3, (%0,%3) \n\t" + "movd %%mm1, (%1) \n\t" + "punpckhdq %%mm1, %%mm1 \n\t" + "movd %%mm1, (%1,%2) \n\t" + "movd %%mm6, (%1,%2,2) \n\t" + "punpckhdq %%mm6, %%mm6 \n\t" + "movd %%mm6, (%1,%3) \n\t" + :: "r" (src), + "r" (src + 4*stride), + "r" ((long) stride ), + "r" ((long)(3*stride)) ); } diff -Naur gephex-0.4.3.old/engine/src/model/model.h gephex-0.4.3/engine/src/model/model.h --- gephex-0.4.3.old/engine/src/model/model.h 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/engine/src/model/model.h 2006-04-30 18:06:22.000000000 -0400 @@ -235,7 +235,7 @@ void deleteModule(utils::AutoPtr, int moduleID); #ifndef NDEBUG - void Model::checkGraphSerialisation(); + void checkGraphSerialisation(); #endif }; diff -Naur gephex-0.4.3.old/modules/src/frbinmodule/ffmpegdriver.cpp gephex-0.4.3/modules/src/frbinmodule/ffmpegdriver.cpp --- gephex-0.4.3.old/modules/src/frbinmodule/ffmpegdriver.cpp 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/modules/src/frbinmodule/ffmpegdriver.cpp 2006-04-30 19:52:10.000000000 -0400 @@ -366,7 +366,7 @@ return m_num_frames; } - void FFMpegDriverImpl::decode_frame(unsigned int frame_number, + void decode_frame(unsigned int frame_number, uint_32* framebuffer, int width, int height) { diff -Naur gephex-0.4.3.old/qtgui/src/gui/graphnameview.cpp gephex-0.4.3/qtgui/src/gui/graphnameview.cpp --- gephex-0.4.3.old/qtgui/src/gui/graphnameview.cpp 2006-04-30 18:05:29.000000000 -0400 +++ gephex-0.4.3/qtgui/src/gui/graphnameview.cpp 2006-04-30 18:07:38.000000000 -0400 @@ -266,7 +266,7 @@ m_textListener->textChanged(1,newStatus.c_str()); } - virtual void GraphItem::propertySelected(int id) + virtual void propertySelected(int id) { switch(id) { @@ -428,7 +428,7 @@ m_textListener->textChanged(1,newStatus.c_str()); } - void SnapItem::propertySelected(int id) + void propertySelected(int id) { switch(id) {