diff options
| author | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-15 00:52:22 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-15 00:52:22 +0200 |
| commit | 52e7764d593cac1acf78aeb1cccb21fa5737a436 (patch) | |
| tree | 17e9947b7e5831e0aa9a2ad32d0d3ede99b60066 /lib/dvb/decoder.cpp | |
| parent | 8b78162072c8c0af8da6fc53af8f4ebe65c410fd (diff) | |
| parent | 93efd56bc9da9404cd00ed9eae2272bea5a0a906 (diff) | |
| download | enigma2-52e7764d593cac1acf78aeb1cccb21fa5737a436.tar.gz enigma2-52e7764d593cac1acf78aeb1cccb21fa5737a436.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/dvb/decoder.cpp')
| -rw-r--r-- | lib/dvb/decoder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 374d3106..90bf19e1 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -13,9 +13,11 @@ #define DMX_PES_VIDEO0 DMX_PES_VIDEO #define DMX_PES_AUDIO0 DMX_PES_AUDIO #define DMX_PES_PCR0 DMX_PES_PCR +#define DMX_PES_TELETEXT0 DMX_PES_TELETEXT #define DMX_PES_VIDEO1 DMX_PES_VIDEO #define DMX_PES_AUDIO1 DMX_PES_AUDIO #define DMX_PES_PCR1 DMX_PES_PCR +#define DMX_PES_TELETEXT1 DMX_PES_TELETEXT #include <ost/dmx.h> #include <ost/video.h> #include <ost/audio.h> @@ -901,7 +903,7 @@ int eTSMPEGDecoder::setState() } if (m_changed & changePCR) { - m_pcr = new eDVBPCR(m_demux); + m_pcr = new eDVBPCR(m_demux, m_decoder); if (m_pcr->setPid(m_pcrpid)) res = -1; } |