[vlc-commits] Yet another Intel Specific DxVA GUID

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Dec  9 12:27:31 2011 +0100| [feeea633e6b0d81bf54c52de29a01786365d6c98] | committer: Jean-Baptiste Kempf

Yet another Intel Specific DxVA GUID

But why? why? why?

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit fa04d6b89accb17724712278359854abb3f4ae30)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=feeea633e6b0d81bf54c52de29a01786365d6c98
---

 modules/codec/avcodec/dxva2.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 11ad2e7..c5277a3 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -105,7 +105,7 @@ static const GUID DXVADDI_Intel_ModeH264_A = {
 static const GUID DXVADDI_Intel_ModeH264_C = {
     0x604F8E66, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
 };
-static const GUID DXVADDI_Intel_ModeH264_E = { // DXVA_Intel_H264_ClearVideo
+static const GUID DXVADDI_Intel_ModeH264_E = { // DXVA_Intel_H264_NoFGT_ClearVideo
     0x604F8E68, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
 };
 static const GUID DXVA2_ModeWMV8_A = {
@@ -148,6 +148,10 @@ static const GUID DXVA_NoEncrypt = {
 static const GUID DXVA_Intel_VC1_ClearVideo = {
     0xBCC5DB6D, 0xA2B6,0x4AF0, {0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89}
 };
+static const GUID DXVA_Intel_VC1_ClearVideo_2 = {
+    0xE07EC519, 0xE651,0x4CD6, {0xAC,0x84,0x13,0x70,0xCC,0xEE,0xC8,0x51}
+};
+
 
 static const GUID DXVA_nVidia_MPEG4_ASP = {
     0x9947EC6F, 0x689B,0x11DC, {0xA3,0x20,0x00,0x19,0xDB,0xBC,0x41,0x84}
@@ -204,6 +208,7 @@ static const dxva2_mode_t dxva2_modes[] = {
     { "VC-1 post processing",                      &DXVA2_ModeVC1_A, 0 },
 
     { "VC-1 variable-length decoder (Intel)",      &DXVA_Intel_VC1_ClearVideo, 0 },
+    { "VC-1 variable-length decoder 2 (Intel)",    &DXVA_Intel_VC1_ClearVideo_2, 0 },
 
     { "MPEG-4 Part 2 nVidia bitstream decoder",                                                         &DXVA_nVidia_MPEG4_ASP,                 0 },
     { "MPEG-4 Part 2 variable-length decoder, Simple Profile",                                          &DXVA_ModeMPEG4pt2_VLD_Simple,          0 },