summaryrefslogtreecommitdiffstats
path: root/kaffeine/src/input/dvb/ts2rtp.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-05 18:20:55 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-05 18:20:55 +0000
commitd32030ae51012a5bd86f8d0db70ee670114aae1e (patch)
tree0a4b65f9ca6da9bf2d7a2f41f4d115cce477dd26 /kaffeine/src/input/dvb/ts2rtp.cpp
parentc1aed14da1f321034f34246af4410993cd0e8912 (diff)
downloadkaffeine-d32030ae51012a5bd86f8d0db70ee670114aae1e.tar.gz
kaffeine-d32030ae51012a5bd86f8d0db70ee670114aae1e.zip
Updated Kaffeine to latest upstream version
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1182813 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaffeine/src/input/dvb/ts2rtp.cpp')
-rw-r--r--kaffeine/src/input/dvb/ts2rtp.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/kaffeine/src/input/dvb/ts2rtp.cpp b/kaffeine/src/input/dvb/ts2rtp.cpp
index 9f87a84..4784122 100644
--- a/kaffeine/src/input/dvb/ts2rtp.cpp
+++ b/kaffeine/src/input/dvb/ts2rtp.cpp
@@ -345,7 +345,12 @@ void Ts2Rtp::psiTables( QPtrList<ChannelDesc> *channels )
buf[off++] = 0x01; // current_next_indicator
buf[off++] = 0x00; // section_number
buf[off++] = 0x00; // last_section_number
- buf[off++] = desc->vpid>>8; buf[off++] = desc->vpid&0xff; // PCR pid
+ if ( desc->vpid ) {
+ buf[off++] = desc->vpid>>8; buf[off++] = desc->vpid&0xff; // PCR pid
+ }
+ else if ( desc->napid ) {
+ buf[off++] = desc->apid[0].pid>>8; buf[off++] = desc->apid[0].pid&0xff; // PCR pid
+ }
buf[off++] = 0x00; buf[off++] = 0x00; // infos_length
if ( desc->vpid ) {
buf[off++] = desc->vType; // stream_type