From 92aa4728d62c091177bc46af8029731f4203b1be Mon Sep 17 00:00:00 2001 From: rfelker Date: Fri, 30 Apr 2004 10:26:26 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12357 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/wine/mmreg.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'loader') diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h index e59ae0a474..b75e34882f 100644 --- a/loader/wine/mmreg.h +++ b/loader/wine/mmreg.h @@ -83,6 +83,7 @@ typedef struct { } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif // !_WAVEFORMATEXTENSIBLE_ +/* typedef struct mpeglayer3waveformat_tag { WORD wFormatTag WINE_PACKED; WORD nChannels WINE_PACKED; @@ -97,6 +98,7 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock WINE_PACKED; WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; +*/ /* WAVE form wFormatTag IDs */ -- cgit v1.2.3