summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-08-27 10:22:22 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2013-08-27 10:22:22 +0200
commit9b1b6b3ce4a7968a809fc9c15eb6148d04d528b2 (patch)
treeb168a1cc8ebbdcbfaebfd80f0bdb4d4e3d008065
parentc8c14e31d82d8c4a0656b7bcb64b9cac089562a8 (diff)
downloadvdr-9b1b6b3ce4a7968a809fc9c15eb6148d04d528b2.tar.gz
vdr-9b1b6b3ce4a7968a809fc9c15eb6148d04d528b2.tar.bz2
Fixed handling DVB subtitle fill region codes for 2 and 8 bpp
-rw-r--r--HISTORY3
-rw-r--r--dvbsubtitle.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index a3826547..3f2cdc22 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7900,6 +7900,7 @@ Video Disk Recorder Revision History
1TB (or larger) disks and use them as a RAID-1 (mirrored). That way, if one disk
fails, you can replace it without data loss.
-2013-08-26: Version 2.1.2
+2013-08-27: Version 2.1.2
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed handling DVB subtitle fill region codes for 2 and 8 bpp.
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 9facc860..f4958f25 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
* Original author: Marco Schluessler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
*
- * $Id: dvbsubtitle.c 2.34 2013/02/22 15:25:25 kls Exp $
+ * $Id: dvbsubtitle.c 3.1 2013/08/27 10:21:05 kls Exp $
*/
#include "dvbsubtitle.h"
@@ -1081,9 +1081,9 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
bs.SkipBits(2); // reserved
if (regionFillFlag) {
switch (region->Bpp()) {
- case 2: region->FillRegion(region8bitPixelCode); break;
+ case 2: region->FillRegion(region2bitPixelCode); break;
case 4: region->FillRegion(region4bitPixelCode); break;
- case 8: region->FillRegion(region2bitPixelCode); break;
+ case 8: region->FillRegion(region8bitPixelCode); break;
default: dbgregions("unknown bpp %d (%s %d)\n", region->Bpp(), __FUNCTION__, __LINE__);
}
}