Index: libs/libmythtv/NuppelVideoPlayer.h
===================================================================
--- libs/libmythtv/NuppelVideoPlayer.h	(revision 9372)
+++ libs/libmythtv/NuppelVideoPlayer.h	(working copy)
@@ -147,7 +147,7 @@
     void NextScanType(void)
         { SetScanType((FrameScanType)(((int)m_scan + 1) & 0x3)); }
     void SetScanType(FrameScanType);
-    FrameScanType GetScanType(void) const { return m_scan; }
+    FrameScanType GetScanType(void) const { return m_scan_locked ? m_scan : kScan_Detect; }
 
     void SetOSDFontName(const QString osdfonts[22], const QString &prefix);
     void SetOSDThemeName(const QString themename);
Index: libs/libmythtv/videoout_null.cpp
===================================================================
--- libs/libmythtv/videoout_null.cpp	(revision 9372)
+++ libs/libmythtv/videoout_null.cpp	(working copy)
@@ -109,6 +109,15 @@
     return true;
 }
 
+bool VideoOutputNull::SetupDeinterlace(bool interlaced, 
+                                       const QString& overridefilter)
+{
+    (void)overridefilter;
+
+    // null vidout doesn't deinterlace
+    return !interlaced;
+}
+
 void VideoOutputNull::Exit(void)
 {
     if (XJ_started) 
Index: libs/libmythtv/videooutbase.cpp
===================================================================
--- libs/libmythtv/videooutbase.cpp	(revision 9372)
+++ libs/libmythtv/videooutbase.cpp	(working copy)
@@ -297,13 +297,6 @@
 bool VideoOutput::SetupDeinterlace(bool interlaced, 
                                    const QString& overridefilter)
 {
-    if (VideoOutputNull *null = dynamic_cast<VideoOutputNull *>(this))
-    {
-        (void)null;
-        // null vidout doesn't deinterlace
-        return !interlaced;
-    }
-
     if (m_deinterlacing == interlaced)
         return m_deinterlacing;
 
Index: libs/libmythtv/videoout_null.h
===================================================================
--- libs/libmythtv/videoout_null.h	(revision 9372)
+++ libs/libmythtv/videoout_null.h	(working copy)
@@ -11,6 +11,7 @@
 
     bool Init(int width, int height, float aspect, WId winid,
               int winx, int winy, int winw, int winh, WId embedid = 0);
+    bool SetupDeinterlace(bool i, const QString& ovrf="");
     void PrepareFrame(VideoFrame *buffer, FrameScanType);
     void Show(FrameScanType );