summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-02-03 10:17:33 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2007-02-03 10:17:33 +0100
commit9809d5a7cc8d94c0b4345aadb926973a024c7d1f (patch)
tree2fdc3fd1d81a224e962e9b4b9963a3b65ec638ff
parent11116e1d5bf403cacee59fc6e55c3c6a1233c17c (diff)
downloadvdr-9809d5a7cc8d94c0b4345aadb926973a024c7d1f.tar.gz
vdr-9809d5a7cc8d94c0b4345aadb926973a024c7d1f.tar.bz2
Removed 'assert(0)' from cDvbSpuDecoder::setTime()
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--config.h4
-rw-r--r--dvbspu.c7
4 files changed, 10 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a1c4c5aa..551a4978 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 30497fe3..147df540 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5035,3 +5035,7 @@ 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).
+
+2007-02-03: Version 1.4.5-2
+
+- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
diff --git a/config.h b/config.h
index 89208794..f7a76081 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.282.1.1 2007/01/26 13:14:47 kls Exp $
+ * $Id: config.h 1.282.1.2 2007/02/03 10:14:42 kls Exp $
*/
#ifndef __CONFIG_H
@@ -21,7 +21,7 @@
// VDR's own version number:
-#define VDRVERSION "1.4.5-1"
+#define VDRVERSION "1.4.5-2"
#define VDRVERSNUM 10405 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
diff --git a/dvbspu.c b/dvbspu.c
index b2935f44..2368d21f 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.21.1.1 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) {