File avifile-gcc41.patch of Package avifile

--- lib/aviplay/aviplay_impl.h
+++ lib/aviplay/aviplay_impl.h
@@ -138,7 +138,7 @@
 
     static const float m_fDropLimit;
 
-    mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at least once from Registry::
+    mutable int propertyRead[LAST_PROPERTY]; // have we read at least once from Registry::
 
     avm::vector<IVideoRenderer*> m_VideoRenderers; // we could draw image to more places
     IAudioRenderer* m_pAudioRenderer; // not sure about the sound - this will be
--- plugins/libaudiodec/audiodecoder.cpp
+++ plugins/libaudiodec/audiodecoder.cpp
@@ -114,7 +114,7 @@
 class MSGSM_Decoder : public IAudioDecoder
 {
 public:
-    MSGSM_Decoder::MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf)
+    MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf)
 	:IAudioDecoder(info, wf)
     {
 	GSM_Init();
--- plugins/libmp3lamebin_audioenc/lameencoder.cpp
+++ plugins/libmp3lamebin_audioenc/lameencoder.cpp
@@ -71,14 +71,14 @@
     int CDECL (*p_lame_set_quality)(lame_global_flags *, int);
 
 public:
-    LameEncoder::LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format)
+    LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format)
 	:IAudioEncoder(info), handle(0)
     {
         m_Error[0] = 0;
 	in_fmt = *format;
     }
 
-    int LameEncoder::init()
+    int init()
     {
 	handle = dlopen(mp3lamename, RTLD_LAZY);
 
--- plugins/libmpeg_audiodec/mpegsound.h
+++ plugins/libmpeg_audiodec/mpegsound.h
@@ -198,14 +198,14 @@
     void forward(int bits) {bitindex+=bits;};
     int getbits(int bits);
 
-    int Mpegbitwindow::getbit(void)
+    int getbit(void)
     {
 	//  register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
 	register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
 	bitindex++;
 	return r;
     }
-    int Mpegbitwindow::getbits9(int bits)
+    int getbits9(int bits)
     {
 	register unsigned short a;
 
@@ -481,9 +481,9 @@
 #define MPEGNOINSTRUMENTFUNCTION
     Mpegbitwindow bitwindow;
 
-    int Mpegtoraw::wgetbit(void) MPEGNOINSTRUMENTFUNCTION   { return bitwindow.getbit(); }
-    int Mpegtoraw::wgetbits9(int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits9(bits); }
-    int Mpegtoraw::wgetbits (int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits (bits); }
+    int wgetbit(void) MPEGNOINSTRUMENTFUNCTION   { return bitwindow.getbit(); }
+    int wgetbits9(int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits9(bits); }
+    int wgetbits (int bits) MPEGNOINSTRUMENTFUNCTION { return bitwindow.getbits (bits); }
 
     /*************************************/
     /* Decoding functions for each layer */
--- samples/misc/avicat.cpp
+++ samples/misc/avicat.cpp
@@ -140,8 +140,8 @@
     avm::IVideoEncoder *vidEnc;
     void copyAudioFrames(int, int, bool);
     void createVideoEncoder(fourcc_t);
-    void AviCutter::writeVideoFrame(avm::CImage *image);
-    void AviCutter::copyVideoFrame();
+    void writeVideoFrame(avm::CImage *image);
+    void copyVideoFrame();
 
 public:
     AviCutter(avm::IWriteFile* outF,