tree dfe8f925540071afc0fe86e9357afa8f0edb5517
parent 96be0f9db9830d2152d2eaeca6e51b12dbc4f608
author Ozkan Sezer <sezeroz@gmail.com> 1340960590 +0000
committer Ozkan Sezer <sezeroz@gmail.com> 1340960590 +0000

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