Ticket #3037: opengl.diff

libs/libmythtv/videooutbase.cpp

@@ -387 +387 @@
 bool VideoOutput::NeedsDoubleFramerate() const
 {
     // Bob deinterlace requires doubling framerate
-    return (m_deintfiltername.contains("bobdeint") &&
-            m_deintfiltername.contains("doublerate") &&
+    return ((m_deintfiltername.contains("bobdeint") ||
+            m_deintfiltername.contains("doublerate")) &&
             m_deinterlacing);
 }
 

libs/libmythtv/videodisplayprofile.cpp

@@ -605 +605 @@
     else if ("opengllinearblend" == short_name)
         return QObject::tr("Linear blend (HW)");
     else if ("openglkerneldeint" == short_name)
-        return QObject::tr("OpenGL Kernel");
+        return QObject::tr("Kernel (HW)");
     else if ("openglbobdeint" == short_name)
         return QObject::tr("Bob (2x, HW)");
     else if ("openglonefield" == short_name)
@@ -614 +614 @@
         return QObject::tr("One Field (2x, HW)");
     else if ("opengldoubleratekerneldeint" == short_name)
         return QObject::tr("Kernel (2x, HW)");
+    else if ("opengldoubleratelinearblend" == short_name)
+        return QObject::tr("Linear blend (2x, HW)");
     return "";
 }
 
@@ -1050 +1052 @@
 
     safe_deint["opengl"] += "opengllinearblend";
     safe_deint["opengl"] += "openglonefield";
+    safe_deint["opengl"] += "openglkerneldeint";
 
     safe_deint["opengl"] += "bobdeint";
     safe_deint["opengl"] += "openglbobdeint";
     safe_deint["opengl"] += "opengldoubleratelinearblend";
     safe_deint["opengl"] += "opengldoublerateonefield";
+    safe_deint["opengl"] += "opengldoubleratekerneldeint";
 
     safe_osd["xv-blit"]     += "softblend";
     safe_osd["xvmc-blit"]   += "chromakey";