aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-07-26 08:54:28 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-07-26 08:54:28 +0200
commit22a96623971e3634e7030b110f57315c21214a1d (patch)
tree656ff2dcbf8cce0e253b6ca393c5b5d73d1b099d /lib
parent672b0fa44cd420dbf5b4d1f9c9a5c3201ada06da (diff)
downloadenigma2-22a96623971e3634e7030b110f57315c21214a1d.tar.gz
enigma2-22a96623971e3634e7030b110f57315c21214a1d.zip
pmt.cpp: more streamtype detection fixes (?!?)
dont handle pids with teletext descriptor as audio/video
Diffstat (limited to 'lib')
-rw-r--r--lib/dvb/pmt.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e1aa096d..833a5218 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -460,11 +460,16 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
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());
- if (issubtitle)
+ if (issubtitle) // continue with next PID
continue;
else if (isvideo)
{