summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-11-22 12:30:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2009-11-22 12:30:17 +0100
commitd8857154a1a193251705088d3a064f6ded5ad6ee (patch)
tree46828384a9527bb8081886b9a6aacc471ff82520
parent8ffbea3788d8c4cc1a83fbb8f3aae7f253cbaeef (diff)
downloadvdr-d8857154a1a193251705088d3a064f6ded5ad6ee.tar.gz
vdr-d8857154a1a193251705088d3a064f6ded5ad6ee.tar.bz2
Fixed handling DVB subtitles for PES recordings
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--dvbsubtitle.c4
3 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9758c48e..70575dc7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1082,6 +1082,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for fixing handling file name length on VFAT systems in case they
contain UTF-8 characters
for fixing wrong bracketing in cChannel::SubtitlingType() etc.
+ for fixing handling DVB subtitles for PES recordings
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 699112a3..bcefec4e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6188,3 +6188,4 @@ Video Disk Recorder Revision History
replaying the recording (at least until the index file has been generated).
- The cRingBufferLinear::Read() function now returns -1 and sets errno to
EAGAIN if the buffer is already full.
+- Fixed handling DVB subtitles for PES recordings (thanks to Rolf Ahrenberg).
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index 69dc6fa9..cd77fde6 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 2.1 2008/05/25 14:36:24 kls Exp $
+ * $Id: dvbsubtitle.c 2.2 2009/11/22 12:28:53 kls Exp $
*/
#include "dvbsubtitle.h"
@@ -699,7 +699,7 @@ int cDvbSubtitleConverter::ConvertFragments(const uchar *Data, int Length)
}
if (Length > PayloadOffset + SubstreamHeaderLength) {
- int64_t pts = PesGetPts(Data);
+ int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0;
if (pts)
dbgconverter("Converter PTS: %lld\n", pts);
const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header