git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pmt.cpp: more streamtype detection fixes (?!?)
[enigma2.git]
/
lib
/
dvb
/
pmt.cpp
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index e1aa096d309f391ce6c9ca938bf433c59a9a3a0f..833a5218b60dfb55dab5228b8f628ac5e1c58ec7 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-460,11
+460,16
@@
int eDVBServicePMTHandler::getProgramInfo(struct program &program)
default:
break;
}
default:
break;
}
- if (issubtitle && (isaudio || isvideo))
+ if (program.textPid != -1 && (isaudio || isvideo))
+ {
+ eDebug("ambiguous streamtype for PID %04x detected.. forced as teletext!", (*es)->getPid());
+ continue; // continue with next PID
+ }
+ else if (issubtitle && (isaudio || isvideo))
eDebug("ambiguous streamtype for PID %04x detected.. forced as subtitle!", (*es)->getPid());
else if (isaudio && isvideo)
eDebug("ambiguous streamtype for PID %04x detected.. forced as video!", (*es)->getPid());
eDebug("ambiguous streamtype for PID %04x detected.. forced as subtitle!", (*es)->getPid());
else if (isaudio && isvideo)
eDebug("ambiguous streamtype for PID %04x detected.. forced as video!", (*es)->getPid());
- if (issubtitle)
+ if (issubtitle)
// continue with next PID
continue;
else if (isvideo)
{
continue;
else if (isvideo)
{