Merge branch 'master' of /home/tmbinc/enigma2-git

diff --combined lib/service/servicedvb.cpp
index bd15bcdc0be164e8579333c86c16b0302672a4d6,c97980fd0f0272a8e0198c0221db51209561bd20..c256213d05373ed64a276cf9d0771d5f92cc9fb7
--- 1/lib/service/servicedvb.cpp
--- 2/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@@ -400,8 -400,6 +400,8 @@@ int eStaticServiceDVBPVRInformation::ge
                return iServiceInformation::resIsString;
        case iServiceInformation::sServiceref:
                return iServiceInformation::resIsString;
 +      case iServiceInformation::sFileSize:
 +              return m_parser.m_filesize;
        case iServiceInformation::sTimeCreate:
                if (m_parser.m_time_create)
                        return m_parser.m_time_create;
@@@ -2826,18 -2824,22 +2826,22 @@@ void eDVBServicePlay::checkSubtitleTimi
                        m_decoder->getPTS(0, pos);
  
                eDebug("%lld %lld", pos, show_time);
-               int diff =  show_time - pos;
+               int diff = show_time - pos;
+               if (type == TELETEXT && !page.m_have_pts)
+               {
+                       eDebug("ttx subtitle page without pts... immediate show");
+                       diff = 0;
+               }
                if (diff < 0)
                {
                        eDebug("[late (%d ms)]", -diff / 90);
                        diff = 0;
                }
- //            if (diff > 900000)
- //            {
- //                    eDebug("[invalid]");
- //                    diff = 0;
- //            }
-       
+               if (abs(diff) > 1800000)
+               {
+                       eDebug("[invalid]... immediate show!");
+                       diff = 0;
+               }
                if ((diff/90)<20)
                {
                        if (type == TELETEXT)