Fixed checking compatibility mode for old subtitles plugin

This commit is contained in:
Klaus Schmidinger 2007-10-17 18:34:17 +02:00
parent 67df515c06
commit dd26d8873f
4 changed files with 13 additions and 7 deletions

View File

@ -1430,6 +1430,7 @@ Marco Schl
for implementing handling DVB subtitles
for fixing the description of DeviceSetAvailableTrack() and cReceiver(), and adding
an example ~cMyReceiver() in PLUGINS.html (thanks to Marco Schlüßler).
for fixing checking compatibility mode for old subtitles plugin
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP

View File

@ -5487,3 +5487,8 @@ Video Disk Recorder Revision History
- Added cDevice::CloseFilter() to allow a device to have complete control over
both opening and closing section filters (thanks to Rolf Ahrenberg).
- Some fixes to PLUGINS.html (thanks to Rolf Ahrenberg).
2007-10-17: Version 1.5.11
- Fixed checking compatibility mode for old subtitles plugin (thanks to Marco
Schlüßler).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 1.299 2007/10/06 14:27:18 kls Exp $
* $Id: config.h 1.300 2007/10/17 18:34:17 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number:
#define VDRVERSION "1.5.10"
#define VDRVERSNUM 10510 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.5.11"
#define VDRVERSNUM 10511 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "1.5.10"
#define APIVERSNUM 10510 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.5.11"
#define APIVERSNUM 10511 // 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

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: device.c 1.145 2007/10/14 13:09:19 kls Exp $
* $Id: device.c 1.146 2007/10/17 18:31:02 kls Exp $
*/
#include "device.h"
@ -1236,7 +1236,7 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
int PayloadOffset = Data[8] + 9;
// Compatibility mode for old subtitles plugin:
if ((Data[PayloadOffset - 3] & 0x81) == 1 && Data[PayloadOffset - 2] == 0x81)
if ((Data[7] & 0x01) && (Data[PayloadOffset - 3] & 0x81) == 0x01 && Data[PayloadOffset - 2] == 0x81)
PayloadOffset--;
uchar SubStreamId = Data[PayloadOffset];