From 746ca44699c120fac91d06289e2ca26b1bac68b5 Mon Sep 17 00:00:00 2001
From: Jim Stichnoth <jstichnoth@mythtv.org>
Date: Wed, 29 May 2013 22:37:43 -0700
Subject: [PATCH] Fix Coverity 746871 (remove a no-longer-used field) and
 746794.

---
 mythtv/libs/libmythtv/videosource.cpp | 2 +-
 mythtv/libs/libmythtv/videosource.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
index 5f0ead32a10..0fa109950fa 100644
--- a/mythtv/libs/libmythtv/videosource.cpp
+++ b/mythtv/libs/libmythtv/videosource.cpp
@@ -135,7 +135,7 @@ class InstanceCount : public TransSpinBoxSetting
                 "programs on a multiplex, if this is set to a value greater "
                 "than one MythTV can sometimes take advantage of this."));
         uint cnt = parent.GetInstanceCount();
-        cnt = (!cnt) ? kDefaultMultirecCount : ((cnt < 1) ? 1 : cnt);
+        cnt = (!cnt) ? kDefaultMultirecCount : cnt;
         setValue(cnt);
     };
 };
diff --git a/mythtv/libs/libmythtv/videosource.h b/mythtv/libs/libmythtv/videosource.h
index 0c8152f35f8..1337c9188c9 100644
--- a/mythtv/libs/libmythtv/videosource.h
+++ b/mythtv/libs/libmythtv/videosource.h
@@ -571,7 +571,9 @@ class DVBConfigurationGroup : public VerticalConfigurationGroup
     DVBCardType                  *cardtype;
     SignalTimeout                *signal_timeout;
     ChannelTimeout               *channel_timeout;
+#if 0
     TransButtonSetting           *buttonAnalog;
+#endif
     DVBTuningDelay               *tuning_delay;
     DiSEqCDevTree                *diseqc_tree;
     TransButtonSetting           *diseqc_btn;