From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sun, 26 Jul 2009 06:54:28 +0000 (+0200)
Subject: pmt.cpp: more streamtype detection fixes (?!?)
X-Git-Tag: 2.6.0~184
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/22a96623971e3634e7030b110f57315c21214a1d

pmt.cpp: more streamtype detection fixes (?!?)
dont handle pids with teletext descriptor as audio/video
---

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)
 					{