summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--config.h10
-rw-r--r--dvbsubtitle.c4
4 files changed, 13 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 60a99e72..3af0210c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -531,6 +531,7 @@ Gregoire Favre <greg@ulima.unil.ch>
for translating OSD texts to the French language
for suggesting to initiate an "emergency exit" if there are UPT errors during a
recording
+ for fixing the declaration of cSubtitleObject::Decode8BppCodeString()
Sven Grothklags <sven@uni-paderborn.de>
for fixing the cutting mechanism to make it re-sync in case a frame is larger
diff --git a/HISTORY b/HISTORY
index 7379bd10..c40f6370 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5528,3 +5528,8 @@ Video Disk Recorder Revision History
in live mode (based on a patch from Reinhard Nissl).
- Fixed stopping live subtitles when a player is attached to the device.
- Fixed suddenly stopping subtitles in live mode.
+
+2007-11-25: Version 1.5.13
+
+- Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to
+ Gregoire Favre).
diff --git a/config.h b/config.h
index 9ecda277..72204440 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.301 2007/11/10 13:38:19 kls Exp $
+ * $Id: config.h 1.302 2007/11/25 13:34:41 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "1.5.12"
-#define VDRVERSNUM 10512 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.5.13"
+#define VDRVERSNUM 10513 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.5.12"
-#define APIVERSNUM 10512 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.5.13"
+#define APIVERSNUM 10513 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index e8455942..16a02c69 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
* Original author: Marco Schlüßler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
*
- * $Id: dvbsubtitle.c 1.2 2007/11/03 14:36:07 kls Exp $
+ * $Id: dvbsubtitle.c 1.3 2007/11/25 13:33:08 kls Exp $
*/
#include "dvbsubtitle.h"
@@ -102,7 +102,7 @@ private:
uchar Get4Bits(const uchar *Data, int &Index);
bool Decode2BppCodeString(const uchar *Data, int &Index, int&x, int y);
bool Decode4BppCodeString(const uchar *Data, int &Index, int&x, int y);
- bool Decode8BppCodeString(const uchar *Data, int &Index, int&y, int y);
+ bool Decode8BppCodeString(const uchar *Data, int &Index, int&x, int y);
public:
cSubtitleObject(int ObjectId, cBitmap *Bitmap);
int ObjectId(void) { return objectId; }