summaryrefslogtreecommitdiffstats
path: root/libmpdemux/ms_hdr.h
diff options
context:
space:
mode:
authortack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 14:27:32 +0000
committertack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 14:27:32 +0000
commitcc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf (patch)
tree49773c4cc09efc6e2009505717711c13af11243d /libmpdemux/ms_hdr.h
parent2f19fe91ec33bd4b480609dd7040e6255e986df9 (diff)
downloadmpv-cc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf.tar.bz2
mpv-cc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf.tar.xz
Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in a
wave file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/ms_hdr.h')
-rw-r--r--libmpdemux/ms_hdr.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 2bfefa9ca2..3d6bc07545 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -34,6 +34,17 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
#endif /* _WAVEFORMATEX_ */
+#ifndef _WAVEFORMATEXTENSIBLE_
+#define _WAVEFORMATEXTENSIBLE_
+typedef struct __attribute__((__packed__)) _WAVEFORMATEXTENSIBLE {
+ WAVEFORMATEX wf;
+ unsigned short wValidBitsPerSample;
+ unsigned int dwChannelMask;
+ unsigned int SubFormat; // Only interested in first 32 bits of guid
+ unsigned int _guid_remainder[3];
+} WAVEFORMATEXTENSIBLE;
+#endif /* _WAVEFORMATEXTENSIBLE_ */
+
#ifndef _MPEGLAYER3WAVEFORMAT_
#define _MPEGLAYER3WAVEFORMAT_
typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {