[dxva] Fixed: missed Intel Clear Video workaround after dx11 upgrade.
authorAnton Fedchin <afedchin@ruswizards.com>
Tue, 28 Jul 2015 08:24:11 +0000 (11:24 +0300)
committerAnton Fedchin <afedchin@ruswizards.com>
Tue, 28 Jul 2015 08:29:38 +0000 (11:29 +0300)
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h

index a5a42bc..5ec1071 100644 (file)
@@ -957,7 +957,7 @@ bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFo
 
   m_avctx = mainctx;
   DXGI_ADAPTER_DESC AIdentifier = g_Windowing.GetAIdentifier();
-  if (AIdentifier.VendorId == PCIV_Intel && m_input == DXVADDI_Intel_ModeH264_E)
+  if (AIdentifier.VendorId == PCIV_Intel && m_format.Guid == DXVADDI_Intel_ModeH264_E)
   {
 #ifdef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO
     m_context->workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
index bd21e44..eac792e 100644 (file)
@@ -172,7 +172,6 @@ protected:
 
   CDXVADecoderWrapper*         m_decoder;
   HANDLE                       m_device;
-  GUID                         m_input;
   D3D11_VIDEO_DECODER_DESC     m_format;
   int                          m_refs;
   CRenderPicture              *m_presentPicture;