Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index b0e92d39ea1f0a078d9717eff484f40b27969983..a74e65cab4d9979ec4275e17b3efab0ebd7bbd1d 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -728,7 +728,7 @@ int eDVBFrontend::readFrontendData(int type)
                                eDebug("FE_READ_SNR failed (%m)");
                        if (!strcmp(m_description, "BCM4501 (internal)"))
                        {
-                               unsigned int SDS_SNRE = snr << 16;
+                               float SDS_SNRE = snr << 16;
                                float snr_in_db;
 
                                if (parm_u_qpsk_fec_inner <= FEC_AUTO) // DVB-S1 / QPSK
@@ -748,7 +748,7 @@ int eDVBFrontend::readFrontendData(int type)
                                        if (fval1 < 10.0)
                                        {
                                                fval2 = SNR_COEFF[0];
-                                               for (int i=0; i<6; ++i)
+                                               for (int i=1; i<6; ++i)
                                                {
                                                        fval2 *= fval1;
                                                        fval2 += SNR_COEFF[i];

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 00350cbb464fc88a978866d648b08db0f0c34fd3..1f529cfd86a95ee00e906f9fee433bdd3275816d 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -29,6 +29,7 @@ class AVSwitch:
                eAVSwitch.getInstance().setVideomode(value)
 
        def getOutputAspect(self):
+               valstr = config.av.aspectratio.value
                if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
                        return (4,3)
                elif valstr == "16_9": # auto ... 4:3 or 16:9