Merge branch 'bug_672_removed_pvr_device'

Conflicts:
	lib/dvb/dvb.cpp

diff --cc lib/dvb/decoder.cpp
Simple merge

diff --cc lib/dvb/dvb.cpp
index c2ddb4099f35de7d73aa093f4b588a4ee9029b17,399e9f58b2593eaa06c3c2e1d52d8f4e8ab2ffa3..6f9a67fbd092002b4b6818805a6a75eb6c29b2b5
--- 1/lib/dvb/dvb.cpp
--- 2/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@@ -522,7 -520,7 +522,7 @@@ RESULT eDVBResourceManager::allocateDem
                        }
                }
        }
-       else if (m_boxtype == DM8000 || m_boxtype == DM7020HD)
 -      else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE)
++      else if (m_boxtype == DM8000 || m_boxtype == DM500HD || m_boxtype == DM800SE || m_boxtype == DM7020HD)
        {
                cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
                for (; i != m_demux.end(); ++i, ++n)

diff --cc lib/dvb/idvb.h
Simple merge

diff --cc lib/dvb/pmt.cpp
Simple merge

diff --cc lib/dvb/pmt.h
Simple merge