vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Mon Feb 6 16:19:09 2012 -0500| [0a818b7758cf40b36835898f86b6f8a85cda1336] | committer: Rafaël Carré
DXVA2_ModeVC1_D2010 is specified by Microsoft (cherry picked from commit 08973b65ec3b7dab6f316454105fa53b345cb015) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=0a818b7758cf40b36835898f86b6f8a85cda1336 --- modules/codec/avcodec/dxva2.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index 29ebb6e..59dee4b 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -136,6 +136,11 @@ static const GUID DXVA2_ModeVC1_D = { 0x1b81beA3, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5} }; +/* Conformity to the August 2010 update of the specification, ModeVC1_VLD2010 */ +static const GUID DXVA2_ModeVC1_D2010 = { + 0x1b81beA4, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5} +}; + static const GUID DXVA_NoEncrypt = { 0x1b81bed0, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5} }; @@ -143,11 +148,6 @@ static const GUID DXVA_NoEncrypt = { /* Vendor extensions */ -/* Conformity to the August 2010 update of the specification, ModeVC1_VLD2010 */ -static const GUID DXVA2_ModeVC1_D2010 = { - 0x1b81beA4, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5} -}; - static const GUID DXVA_Intel_VC1_ClearVideo = { 0xBCC5DB6D, 0xA2B6,0x4AF0, {0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89} }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
