[coverity] Fix #1126020: Remove logically dead code

tobbi · Aug 23, 2015 · f8103e6 · f8103e6
1 parent ab27f08
commit f8103e6
Showing 1 changed file with 3 additions and 25 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1968,31 +1968,9 @@ void CMixer::SetSharpness()
 
 EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */)
 {
-  EINTERLACEMETHOD method = CMediaSettings::GetInstance().GetCurrentVideoSettings().m_InterlaceMethod;
-  if (method == VS_INTERLACEMETHOD_AUTO)
-  {
-    int deint = -1;
-//    if (m_config.outHeight >= 720)
-//      deint = g_advancedSettings.m_videoVDPAUdeintHD;
-//    else
-//      deint = g_advancedSettings.m_videoVDPAUdeintSD;
-
-    if (deint != -1)
-    {
-      if (m_config.vdpau->Supports(EINTERLACEMETHOD(deint)))
-      {
-        method = EINTERLACEMETHOD(deint);
-        if (log)
-          CLog::Log(LOGNOTICE, "CVDPAU::GetDeinterlacingMethod: set de-interlacing to %d",  deint);
-      }
-      else
-      {
-        if (log)
-          CLog::Log(LOGWARNING, "CVDPAU::GetDeinterlacingMethod: method for de-interlacing (advanced settings) not supported");
-      }
-    }
-  }
-  return method;
+  // XXX: Ideally, the deinterlacing method should be detected at runtime.
+  // See https://github.com/xbmc/xbmc/pull/7799 for discussion.
+  return CMediaSettings::GetInstance().GetCurrentVideoSettings().m_InterlaceMethod;
 }
 
 void CMixer::SetDeinterlacing()