Merge from the trunk rev. 4808:
2012-02-07 Rafaël Carré <funman@videolan.org>
* libsrc/dxva-uuid.c (New file): Add DXVA UUIDs
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5158 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 5305202..e297c1e 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-29 Ozkan Sezer <sezeroz@gmail.com>
+
+ Merge from the trunk rev. 4808:
+ 2012-02-07 Rafaël Carré <funman@videolan.org>
+ * libsrc/dxva-uuid.c (New file): Add DXVA UUIDs
+
2012-06-28 Ozkan Sezer <sezeroz@gmail.com>
Merge from trunk rev.5048:
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index ca62c50..4b70101 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -101,7 +101,7 @@
libsrc/unknwn-uuid.c libsrc/urlmon-uuid.c libsrc/vds-uuid.c libsrc/virtdisk-uuid.c \
libsrc/wia-uuid.c libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/ntddkbd-uuid.c \
libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddser-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddstor-uuid.c \
- libsrc/ntddvdeo-uuid.c
+ libsrc/ntddvdeo-uuid.c libsrc/dxva-uuid.c
src_libws2_32=libsrc/ws2_32.c \
\
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 82b6402..570efb8 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -1013,7 +1013,8 @@
libsrc/usbiodef-uuid.c libsrc/ntddkbd-uuid.c \
libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c \
libsrc/ntddser-uuid.c libsrc/ntddscsi-uuid.c \
- libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c
+ libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c \
+ libsrc/dxva-uuid.c
am__objects_20 = libsrc/lib32_libuuid_a-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-guid_nul.$(OBJEXT) \
libsrc/lib32_libuuid_a-devguid.$(OBJEXT) \
@@ -1057,7 +1058,8 @@
libsrc/lib32_libuuid_a-ntddser-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-ntddscsi-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-ntddstor-uuid.$(OBJEXT) \
- libsrc/lib32_libuuid_a-ntddvdeo-uuid.$(OBJEXT)
+ libsrc/lib32_libuuid_a-ntddvdeo-uuid.$(OBJEXT) \
+ libsrc/lib32_libuuid_a-dxva-uuid.$(OBJEXT)
@LIB32_TRUE@am_lib32_libuuid_a_OBJECTS = $(am__objects_20)
lib32_libuuid_a_OBJECTS = $(am_lib32_libuuid_a_OBJECTS)
lib32_libws2_32_a_LIBADD =
@@ -2001,7 +2003,8 @@
libsrc/usbiodef-uuid.c libsrc/ntddkbd-uuid.c \
libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c \
libsrc/ntddser-uuid.c libsrc/ntddscsi-uuid.c \
- libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c
+ libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c \
+ libsrc/dxva-uuid.c
am__objects_40 = libsrc/lib64_libuuid_a-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-guid_nul.$(OBJEXT) \
libsrc/lib64_libuuid_a-devguid.$(OBJEXT) \
@@ -2045,7 +2048,8 @@
libsrc/lib64_libuuid_a-ntddser-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-ntddscsi-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-ntddstor-uuid.$(OBJEXT) \
- libsrc/lib64_libuuid_a-ntddvdeo-uuid.$(OBJEXT)
+ libsrc/lib64_libuuid_a-ntddvdeo-uuid.$(OBJEXT) \
+ libsrc/lib64_libuuid_a-dxva-uuid.$(OBJEXT)
@LIB64_TRUE@am_lib64_libuuid_a_OBJECTS = $(am__objects_40)
lib64_libuuid_a_OBJECTS = $(am_lib64_libuuid_a_OBJECTS)
lib64_libws2_32_a_LIBADD =
@@ -3188,7 +3192,7 @@
libsrc/unknwn-uuid.c libsrc/urlmon-uuid.c libsrc/vds-uuid.c libsrc/virtdisk-uuid.c \
libsrc/wia-uuid.c libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/ntddkbd-uuid.c \
libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddser-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddstor-uuid.c \
- libsrc/ntddvdeo-uuid.c
+ libsrc/ntddvdeo-uuid.c libsrc/dxva-uuid.c
src_libws2_32 = libsrc/ws2_32.c \
\
@@ -5699,6 +5703,8 @@
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib32_libuuid_a-ntddvdeo-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
+libsrc/lib32_libuuid_a-dxva-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \
+ libsrc/$(DEPDIR)/$(am__dirstamp)
lib32/libuuid.a: $(lib32_libuuid_a_OBJECTS) $(lib32_libuuid_a_DEPENDENCIES) lib32/$(am__dirstamp)
-rm -f lib32/libuuid.a
$(lib32_libuuid_a_AR) lib32/libuuid.a $(lib32_libuuid_a_OBJECTS) $(lib32_libuuid_a_LIBADD)
@@ -7130,6 +7136,8 @@
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib64_libuuid_a-ntddvdeo-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
+libsrc/lib64_libuuid_a-dxva-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \
+ libsrc/$(DEPDIR)/$(am__dirstamp)
lib64/libuuid.a: $(lib64_libuuid_a_OBJECTS) $(lib64_libuuid_a_DEPENDENCIES) lib64/$(am__dirstamp)
-rm -f lib64/libuuid.a
$(lib64_libuuid_a_AR) lib64/libuuid.a $(lib64_libuuid_a_OBJECTS) $(lib64_libuuid_a_LIBADD)
@@ -8486,6 +8494,7 @@
-rm -f libsrc/lib32_libuuid_a-comcat-uuid.$(OBJEXT)
-rm -f libsrc/lib32_libuuid_a-devguid.$(OBJEXT)
-rm -f libsrc/lib32_libuuid_a-docobj-uuid.$(OBJEXT)
+ -rm -f libsrc/lib32_libuuid_a-dxva-uuid.$(OBJEXT)
-rm -f libsrc/lib32_libuuid_a-exdisp-uuid.$(OBJEXT)
-rm -f libsrc/lib32_libuuid_a-extras-uuid.$(OBJEXT)
-rm -f libsrc/lib32_libuuid_a-fwp-uuid.$(OBJEXT)
@@ -8555,6 +8564,7 @@
-rm -f libsrc/lib64_libuuid_a-comcat-uuid.$(OBJEXT)
-rm -f libsrc/lib64_libuuid_a-devguid.$(OBJEXT)
-rm -f libsrc/lib64_libuuid_a-docobj-uuid.$(OBJEXT)
+ -rm -f libsrc/lib64_libuuid_a-dxva-uuid.$(OBJEXT)
-rm -f libsrc/lib64_libuuid_a-exdisp-uuid.$(OBJEXT)
-rm -f libsrc/lib64_libuuid_a-extras-uuid.$(OBJEXT)
-rm -f libsrc/lib64_libuuid_a-fwp-uuid.$(OBJEXT)
@@ -9968,6 +9978,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-comcat-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-devguid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-docobj-uuid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-exdisp-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-extras-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-fwp-uuid.Po@am__quote@
@@ -10037,6 +10048,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-comcat-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-devguid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-docobj-uuid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-exdisp-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-extras-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-fwp-uuid.Po@am__quote@
@@ -19923,6 +19935,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-ntddvdeo-uuid.obj `if test -f 'libsrc/ntddvdeo-uuid.c'; then $(CYGPATH_W) 'libsrc/ntddvdeo-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/ntddvdeo-uuid.c'; fi`
+libsrc/lib32_libuuid_a-dxva-uuid.o: libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-dxva-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Tpo -c -o libsrc/lib32_libuuid_a-dxva-uuid.o `test -f 'libsrc/dxva-uuid.c' || echo '$(srcdir)/'`libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libsrc/dxva-uuid.c' object='libsrc/lib32_libuuid_a-dxva-uuid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-dxva-uuid.o `test -f 'libsrc/dxva-uuid.c' || echo '$(srcdir)/'`libsrc/dxva-uuid.c
+
+libsrc/lib32_libuuid_a-dxva-uuid.obj: libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-dxva-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Tpo -c -o libsrc/lib32_libuuid_a-dxva-uuid.obj `if test -f 'libsrc/dxva-uuid.c'; then $(CYGPATH_W) 'libsrc/dxva-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/dxva-uuid.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-dxva-uuid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libsrc/dxva-uuid.c' object='libsrc/lib32_libuuid_a-dxva-uuid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-dxva-uuid.obj `if test -f 'libsrc/dxva-uuid.c'; then $(CYGPATH_W) 'libsrc/dxva-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/dxva-uuid.c'; fi`
+
libsrc/lib32_libws2_32_a-ws2_32.o: libsrc/ws2_32.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libws2_32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libws2_32_a-ws2_32.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libws2_32_a-ws2_32.Tpo -c -o libsrc/lib32_libws2_32_a-ws2_32.o `test -f 'libsrc/ws2_32.c' || echo '$(srcdir)/'`libsrc/ws2_32.c
@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib32_libws2_32_a-ws2_32.Tpo libsrc/$(DEPDIR)/lib32_libws2_32_a-ws2_32.Po
@@ -28463,6 +28489,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-ntddvdeo-uuid.obj `if test -f 'libsrc/ntddvdeo-uuid.c'; then $(CYGPATH_W) 'libsrc/ntddvdeo-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/ntddvdeo-uuid.c'; fi`
+libsrc/lib64_libuuid_a-dxva-uuid.o: libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-dxva-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Tpo -c -o libsrc/lib64_libuuid_a-dxva-uuid.o `test -f 'libsrc/dxva-uuid.c' || echo '$(srcdir)/'`libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libsrc/dxva-uuid.c' object='libsrc/lib64_libuuid_a-dxva-uuid.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-dxva-uuid.o `test -f 'libsrc/dxva-uuid.c' || echo '$(srcdir)/'`libsrc/dxva-uuid.c
+
+libsrc/lib64_libuuid_a-dxva-uuid.obj: libsrc/dxva-uuid.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-dxva-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Tpo -c -o libsrc/lib64_libuuid_a-dxva-uuid.obj `if test -f 'libsrc/dxva-uuid.c'; then $(CYGPATH_W) 'libsrc/dxva-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/dxva-uuid.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-dxva-uuid.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libsrc/dxva-uuid.c' object='libsrc/lib64_libuuid_a-dxva-uuid.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-dxva-uuid.obj `if test -f 'libsrc/dxva-uuid.c'; then $(CYGPATH_W) 'libsrc/dxva-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/dxva-uuid.c'; fi`
+
libsrc/lib64_libws2_32_a-ws2_32.o: libsrc/ws2_32.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libws2_32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libws2_32_a-ws2_32.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libws2_32_a-ws2_32.Tpo -c -o libsrc/lib64_libws2_32_a-ws2_32.o `test -f 'libsrc/ws2_32.c' || echo '$(srcdir)/'`libsrc/ws2_32.c
@am__fastdepCC_TRUE@ $(am__mv) libsrc/$(DEPDIR)/lib64_libws2_32_a-ws2_32.Tpo libsrc/$(DEPDIR)/lib64_libws2_32_a-ws2_32.Po
diff --git a/mingw-w64-crt/libsrc/dxva-uuid.c b/mingw-w64-crt/libsrc/dxva-uuid.c
new file mode 100644
index 0000000..9273219
--- /dev/null
+++ b/mingw-w64-crt/libsrc/dxva-uuid.c
@@ -0,0 +1,40 @@
+/**
+ * DISCLAIMER
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the mingw-w64 runtime package.
+ *
+ * The mingw-w64 runtime package and its code is distributed in the hope that it
+ * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR
+ * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to
+ * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#if defined(__LCC__) || defined(__GNUC__)
+#define INITGUID 1
+#include <windows.h>
+#else
+#include <basetyps.h>
+#endif
+
+DEFINE_GUID(IID_IDirectXVideoDecoderService, 0xfc51a551, 0xd5e7, 0x11d9, 0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
+DEFINE_GUID(IID_IDirectXVideoAccelerationService, 0xfc51a550, 0xd5e7, 0x11d9, 0xaf,0x55,0x00,0x05,0x4e,0x43,0xff,0x02);
+
+DEFINE_GUID(DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0,0x4563, 0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);
+DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);
+DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);
+DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index c334518..6776e4d 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
/* Do not edit. Autogenerated. */
-#define __MINGW_W64_REV "5152"
-#define __MINGW_W64_REV_STAMP "2012-06-28"
+#define __MINGW_W64_REV "5158"
+#define __MINGW_W64_REV_STAMP "2012-06-29"
