summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-10-24 14:32:38 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-10-24 14:32:38 +0200
commit514ee9e63ab869722e920f6d1d27b5b78c85153d (patch)
treeae026c7a7f9fb5a4e73b47123ced4083c3b5930f
parent262c2666379212aa80af7746b3ce823fa0ae9fd1 (diff)
downloadvdr-514ee9e63ab869722e920f6d1d27b5b78c85153d.tar.gz
vdr-514ee9e63ab869722e920f6d1d27b5b78c85153d.tar.bz2
Improved cDvbDevice::StillPicture() (cont'd)
-rw-r--r--HISTORY4
-rw-r--r--config.h4
-rw-r--r--dvbdevice.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 6ca76bc1..54186bc3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2437,3 +2437,7 @@ Video Disk Recorder Revision History
2003-10-19: Version 1.2.6pre2
- Improved cDvbDevice::StillPicture() (thanks to Thomas Heiligenmann).
+
+2003-10-24: Version 1.2.6pre3
+
+- Improved cDvbDevice::StillPicture() (thanks to Oliver Endriss).
diff --git a/config.h b/config.h
index 6faca7c5..625e3e65 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.176.1.1 2003/10/19 11:43:07 kls Exp $
+ * $Id: config.h 1.176.1.2 2003/10/24 14:31:17 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "device.h"
#include "tools.h"
-#define VDRVERSION "1.2.6pre2"
+#define VDRVERSION "1.2.6pre3"
#define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
diff --git a/dvbdevice.c b/dvbdevice.c
index 0dedfe81..ebb236e7 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 1.67.1.1 2003/10/19 11:41:07 kls Exp $
+ * $Id: dvbdevice.c 1.67.1.2 2003/10/24 14:32:20 kls Exp $
*/
#include "dvbdevice.h"
@@ -963,7 +963,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
offs += Data[i + 8];
len -= 3;
len -= Data[i + 8];
- if (len < 0 || offs + len >= Length)
+ if (len < 0 || offs + len > Length)
break;
}
else {