aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2016-01-08 05:51:41 -0800
committerMartijn Kaijser <martijn@xbmc.org>2016-01-08 05:51:41 -0800
commitac815410fd7045799004935a58a9dae9f19993c6 (patch)
tree6ec65bde1198d50e8388cce62cb3b6e7798712e9
parent94a1b98d6ef860eb0ad051cf1fb6f5c10e31da2f (diff)
parent4cce4604364d65107c6dc534ae2092fc11e2a61a (diff)
Merge pull request #8792 from Voyager1/deinterlace-fix-jarvis
[backport] Fix broken DXVA deinterlacing
-rw-r--r--xbmc/cores/VideoRenderers/DXVAHD.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/xbmc/cores/VideoRenderers/DXVAHD.cpp b/xbmc/cores/VideoRenderers/DXVAHD.cpp
index 472fdf01ad..98850d8f3e 100644
--- a/xbmc/cores/VideoRenderers/DXVAHD.cpp
+++ b/xbmc/cores/VideoRenderers/DXVAHD.cpp
@@ -586,9 +586,7 @@ bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, ID3D11Vi
deinterlace_mode = (flags & RENDER_FLAG_FIELD0 || flags & RENDER_FLAG_FIELD1) ? VS_DEINTERLACEMODE_FORCE : VS_DEINTERLACEMODE_OFF;
EINTERLACEMETHOD interlace_method = g_renderManager.AutoInterlaceMethod(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_InterlaceMethod);
- bool progressive = deinterlace_mode == VS_DEINTERLACEMODE_OFF
- || ( interlace_method != VS_INTERLACEMETHOD_DXVA_BOB
- && interlace_method != VS_INTERLACEMETHOD_DXVA_BEST);
+ bool progressive = deinterlace_mode == VS_DEINTERLACEMODE_OFF;
ID3D11Texture2D* targetTex = nullptr;
hr = target->QueryInterface(__uuidof(ID3D11Texture2D), reinterpret_cast<void**>(&targetTex));