[Mplayer-cvslog] CVS: main/loader/wine mmreg.h,1.7,1.8

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/loader/wine
In directory mail:/var2/tmp/cvs-serv30320/loader/wine

Modified Files:
	mmreg.h 
Log Message:
minimal fix for alex's 1000000000000l compile errors. imo the fix in
aviheader.h is totally correct. defining useless typedefs that can
conflict with other headers is bad practice. i don't like editing
mmreg.h but oh well... if you have a better fix, commit it! finally,
the fix in the ad_ and vd_ files seems totally correct.


Index: mmreg.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/mmreg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mmreg.h	13 Sep 2002 19:43:17 -0000	1.7
+++ mmreg.h	30 Apr 2004 10:26:26 -0000	1.8
@@ -83,6 +83,7 @@
 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
 #endif // !_WAVEFORMATEXTENSIBLE_
 
+/*
 typedef struct mpeglayer3waveformat_tag {
   WORD   wFormatTag WINE_PACKED;
   WORD   nChannels WINE_PACKED;
@@ -97,6 +98,7 @@
   WORD          nFramesPerBlock WINE_PACKED;
   WORD          nCodecDelay WINE_PACKED;
 } MPEGLAYER3WAVEFORMAT;
+*/
 
 /* WAVE form wFormatTag IDs */