Merge branch 'master' into tmbinc/FixTimingBugs

Conflicts:

	lib/dvb/sec.cpp
	lib/python/Components/Network.py
	lib/python/Components/Playlist.py
	lib/python/Plugins/Extensions/DVDBurn/Process.py
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
	lib/python/Screens/TimerEdit.py
	po/lt.po
	po/nl.po
	po/tr.po

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

diff --cc lib/dvb/pvrparse.cpp
index dfc622492069dde979f5773fc550f3b4c6a8bd98,1b6cb467c8a25c71cf129a95f1cc335b97db37fb..c7a37460a44619de77dc4ad9633ef15c2d4e7d1b
--- 1/lib/dvb/pvrparse.cpp
--- 2/lib/dvb/pvrparse.cpp
+++ b/lib/dvb/pvrparse.cpp
@@@ -365,13 -347,12 +365,13 @@@ int eMPEGStreamParserTS::processPacket(
                        if (ptsvalid)
                        {
                                m_streaminfo.m_access_points[offset] = pts;
-                               eDebug("Sequence header at %llx, pts %llx", offset, pts);
+ //                            eDebug("Sequence header at %llx, pts %llx", offset, pts);
                        } else
-                               eDebug("Sequence header but no valid PTS value.");
+                               /*eDebug("Sequence header but no valid PTS value.")*/;
                }
  
 -              if (pkt[3] == 0x09) /* MPEG4 AVC unit access delimiter */
 +              if (pkt[3] == 0x09 &&   /* MPEG4 AVC unit access delimiter */
 +                       (pkt[4] >> 5) == 0) /* and I-frame */
                {
                        if (ptsvalid)
                        {

diff --cc lib/python/Components/Network.py
index bed9d95fc1c02884d47045f62a33f3095b15fa1f,f32a648c05d0737f333d8fed9f400f7796cfedbc..64b3aa6cefc522b616dd77d56201840fe05315d4
mode 100644,100755..100755
--- 1/lib/python/Components/Network.py
--- 2/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py

diff --cc lib/service/servicedvb.cpp
Simple merge