Bug 731807 - Fix for error building with VC11 - 'ksguid.lib' not found. r=khuey

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

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;