Mercurial > mplayer.hg

diff libmpdemux/ms_hdr.h @ 12979:6f18105c058a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better protection against double definition of MPEGLAYER3WAVEFORMAT
author wight
date Mon, 09 Aug 2004 15:53:10 +0000
parents 0db4a3a5b01d
children 20673742a6e7
line wrap: on
line diff
--- a/libmpdemux/ms_hdr.h	Mon Aug 09 11:12:52 2004 +0000
+++ b/libmpdemux/ms_hdr.h	Mon Aug 09 15:53:10 2004 +0000
@@ -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_