From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 17 Nov 2008 14:42:54 +0000 (+0100)
Subject: Merge branch 'master' into tmbinc/FixTimingBugs
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=a34ef895210161a8820e96829ac87806566e7858

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
---

a34ef895210161a8820e96829ac87806566e7858
diff --cc lib/dvb/pvrparse.cpp
index dfc6224,1b6cb46..c7a3746
--- a/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 bed9d95,f32a648..64b3aa6
mode 100644,100755..100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py