Merge from the trunk revs. 4808 and 5149: 2012-02-07 Rafaël Carré <funman@videolan.org> * dxva2api.h : Add missing UUIDS 2012-06-28 Rafaël Carré <funman@videolan.org> * dxva2api.h: Remove DXVA_* GUIDs and structs ... * dxva.h: ... And put them here. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5157 4407c894-4637-0410-b4f5-ada5f102cad1