Merge branch 'master' into tmbinc/FixTimingBugs
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 17 Nov 2008 14:42:54 +0000 (15:42 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 17 Nov 2008 14:42:54 +0000 (15:42 +0100)
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

1  2 
lib/dvb/dvb.cpp
lib/dvb/pvrparse.cpp
lib/python/Components/Network.py
lib/service/servicedvb.cpp

diff --cc lib/dvb/dvb.cpp
Simple merge
@@@ -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)
                        {
Simple merge