From 93ef4685f426e7a3481d254fbe335fdb0954c636 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Tue, 27 Mar 2012 08:36:57 -0500
Subject: [PATCH] Bug 731807 - Fix for error building with VC11 - 'ksguid.lib'
 not found. r=khuey

---
 layout/media/Makefile.in         | 2 +-
 media/libcubeb/src/cubeb_winmm.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
index 6988a80d389f..55e93b85b6bc 100644
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -107,7 +107,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
 endif
 
 ifdef MOZ_CUBEB
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, winmm ksguid)
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, winmm)
 endif
 
 DEFFILE = symbols.def
diff --git a/media/libcubeb/src/cubeb_winmm.c b/media/libcubeb/src/cubeb_winmm.c
index 1a0b98317f6a..b857a23e6eab 100644
--- a/media/libcubeb/src/cubeb_winmm.c
+++ b/media/libcubeb/src/cubeb_winmm.c
@@ -17,6 +17,11 @@
 
 #define NBUFS 4
 
+static const GUID KSDATAFORMAT_SUBTYPE_PCM = 
+{ 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+static const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = 
+{ 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+
 struct cubeb_stream_item {
   SLIST_ENTRY head;
   cubeb_stream * stream;