summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-30 10:26:26 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-30 10:26:26 +0000
commit92aa4728d62c091177bc46af8029731f4203b1be (patch)
tree66b1a8a09694558c205f740e6e5e6592c9ae8c45 /loader
parente2cb51329286aeaf30da0fb417959d4667d0c726 (diff)
downloadmpv-92aa4728d62c091177bc46af8029731f4203b1be.tar.bz2
mpv-92aa4728d62c091177bc46af8029731f4203b1be.tar.xz
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
Diffstat (limited to 'loader')
-rw-r--r--loader/wine/mmreg.h2
1 files changed, 2 insertions, 0 deletions
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 */