I uploaded the following nmu: diff -urN avifile-0.7.44.20051021~/debian/changelog avifile-0.7.44.20051021/debian/changelog --- avifile-0.7.44.20051021~/debian/changelog 2006-06-03 19:17:44.000000000 +0000 +++ avifile-0.7.44.20051021/debian/changelog 2006-06-08 19:55:27.000000000 +0000 @@ -1,3 +1,9 @@ +avifile (1:0.7.44.20051021-2.1) unstable; urgency=low + + * Remove extra qualifications from more C++ files (Closes: #372193). + + -- Martin Michlmayr <[EMAIL PROTECTED]> Thu, 08 Jun 2006 21:55:07 +0200 + avifile (1:0.7.44.20051021-2) unstable; urgency=low * NMU as part of the GCC 4.1 transition. diff -urN avifile-0.7.44.20051021~/plugins/libmpeg_audiodec/mpegsound.h avifile-0.7.44.20051021/plugins/libmpeg_audiodec/mpegsound.h --- avifile-0.7.44.20051021~/plugins/libmpeg_audiodec/mpegsound.h 2004-07-10 14:55:41.000000000 +0000 +++ avifile-0.7.44.20051021/plugins/libmpeg_audiodec/mpegsound.h 2006-06-08 19:54:12.000000000 +0000 @@ -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 */
-- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]