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

Conflicts:

	lib/dvb/decoder.cpp

diff --cc lib/dvb/decoder.cpp
index 66b923a,065a49c..f73dbdd
--- 1/lib/dvb/decoder.cpp
--- 2/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@@ -190,11 -190,15 +190,15 @@@ int eDVBAudio::startPid(int pid, int ty
        case aDTS:
                bypass = 2;
                break;
-               */
+       case aAAC:
+               bypass = 8;
+               break;
+       case aAACHE:
+               bypass = 9;
+               break;
        }
  
 -      eDebugNoNewLine("AUDIO_SET_BYPASS - ");
 +      eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
        if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
                eDebug("failed (%m)");
        else
@@@ -291,7 -303,8 +295,9 @@@ eDVBAudio::~eDVBAudio(
  DEFINE_REF(eDVBVideo);
  
  eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
-       :m_demux(demux), m_dev(dev)
 -      :m_demux(demux), m_dev(dev), m_is_slow_motion(0), m_is_fast_forward(0), m_is_freezed(0)
 -      ,m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
++<<<<<<< HEAD:lib/dvb/decoder.cpp
++      : m_demux(demux), m_dev(dev),
++      m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
  {
        char filename[128];
  #if HAVE_DVB_API_VERSION < 3

diff --cc lib/dvb/decoder.h
Simple merge

diff --cc lib/dvb/dvb.cpp
index 28012e7,2460943..c320fc7
--- 1/lib/dvb/dvb.cpp
--- 2/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@@ -1336,13 -1328,13 +1337,13 @@@ void eDVBChannel::getNextSourceSpan(off
                                eDebug("AP relative seeking failed!");
                        } else
                        {
 -                              eDebug("next ap is %llx\n", pts);
                                pts = nextap;
 +                              eDebug("next ap is %llx\n", pts);
                        }
                }
-               
+ 
                off_t offset = 0;
 -              if (m_tstools.getOffset(offset, pts))
 +              if (m_tstools.getOffset(offset, pts, -1))
                {
                        eDebug("get offset for pts=%lld failed!", pts);
                        continue;

diff --cc lib/dvb/idvb.h
Simple merge

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

diff --cc lib/dvb/pvrparse.h
Simple merge

diff --cc lib/python/Screens/InfoBarGenerics.py
Simple merge

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

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