mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
fix segfault
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@119 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3ad025968
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2009-12-24 (Thu, 24 Dec 2009)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -122,7 +122,6 @@ void ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream
|
||||
std::string name;
|
||||
uint8_t service_type;
|
||||
unsigned short vpid, apid, pcrpid, pmtpid, txpid, vtype, scrambled;
|
||||
tallchans_iterator cit;
|
||||
std::string desc = "";
|
||||
desc += "Preset";
|
||||
t_channel_id chid;
|
||||
@@ -186,7 +185,7 @@ void ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream
|
||||
scnt++;
|
||||
tallchans_iterator cit1 = ret.first;
|
||||
cit1->second.scrambled = scrambled;
|
||||
service_type = cit->second.getServiceType();
|
||||
service_type = cit1->second.getServiceType();
|
||||
if(pmtpid != 0 && (((service_type == 2) && (apid > 0)) || ( (service_type == 1) && (vpid > 0) && (apid > 0))) ) {
|
||||
DBG("[getserv] preset chan %s vpid %X sid %X tpid %X onid %X\n", name.c_str(), vpid, service_id, transport_stream_id, transport_stream_id);
|
||||
cit1->second.setVideoPid(vpid);
|
||||
|
Reference in New Issue
Block a user