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 * With some input from the "subtitle plugin" by Pekka Virtanen * - * $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__); } }