CVS change done by Torinthiel CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv14940/libmpdemux Modified Files: ms_hdr.h Log Message: Better protection against double definition of MPEGLAYER3WAVEFORMAT Index: ms_hdr.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/ms_hdr.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ms_hdr.h 28 Apr 2004 10:18:33 -0000 1.1 +++ ms_hdr.h 9 Aug 2004 15:53:10 -0000 1.2 @@ -14,6 +14,8 @@ } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ +#ifndef _MPEGLAYER3WAVEFORMAT_ +#define _MPEGLAYER3WAVEFORMAT_ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { WAVEFORMATEX wf; unsigned short wID; @@ -22,6 +24,7 @@ unsigned short nFramesPerBlock; unsigned short nCodecDelay; } MPEGLAYER3WAVEFORMAT; +#endif /* _MPEGLAYER3WAVEFORMAT_ */ #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) #define _BITMAPINFOHEADER_