summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-02-03 10:26:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2007-02-03 10:26:17 +0100
commit31820a5175b26e86effe9594d9293ecec2ac5812 (patch)
treeb48ac3be46f868949bad5b3cde3721a5a0c87b4c
parentd919573037912d85690bf0d944d9c1bd09af65e7 (diff)
downloadvdr-31820a5175b26e86effe9594d9293ecec2ac5812.tar.gz
vdr-31820a5175b26e86effe9594d9293ecec2ac5812.tar.bz2
Removed 'assert(0)' from cDvbSpuDecoder::setTime()
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY7
-rw-r--r--dvbspu.c7
3 files changed, 10 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ad46afdd..39b1237a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1389,6 +1389,7 @@ Marco Schlüßler <marco@lordzodiac.de>
replay has been stopped
for reporting a problem with displaying the replay mode symbol in case of "Multi
speed mode"
+ for removing 'assert(0)' from cDvbSpuDecoder::setTime()
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index da50f4a3..1b077217 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5091,7 +5091,11 @@ Video Disk Recorder Revision History
with open file handles when starting background commands (thanks to Reinhard
Nissl).
-2007-01-26: Version 1.5.1
+2007-02-03: Version 1.4.5-2
+
+- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
+
+2007-02-03: Version 1.5.1
- Added cDevice::HasCi() so that devices with Common Interface can be avoided
when tuning to an FTA channel, thus preserving the CAM resources even on budget
@@ -5100,3 +5104,4 @@ Video Disk Recorder Revision History
- Now using cPipe instead of popen() in cCommand::Execute() to avoid problems
with open file handles when starting background commands (thanks to Reinhard
Nissl).
+- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
diff --git a/dvbspu.c b/dvbspu.c
index b2935f44..1ca5435f 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
- * $Id: dvbspu.c 1.21 2006/04/17 11:00:00 kls Exp $
+ * $Id: dvbspu.c 1.22 2007/02/03 10:13:18 kls Exp $
*/
#include "dvbspu.h"
@@ -504,9 +504,8 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
default:
esyslog("invalid sequence in control header (%.2x)",
spu[i]);
- assert(0);
- i++;
- break;
+ Empty();
+ return 0;
}
}
if (fodd != 0 && feven != 0) {