summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-03-05 15:22:38 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-03-05 15:22:38 +0100
commit8ae3142f945aba1166654452e319e3ac361b6356 (patch)
treeb8cef6f7cbba7f84104668e993cf37030f4cd84a
parentad557ab2142bf9969cfa67bc433ed3045b6d822e (diff)
downloadvdr-8ae3142f945aba1166654452e319e3ac361b6356.tar.gz
vdr-8ae3142f945aba1166654452e319e3ac361b6356.tar.bz2
Fixed some descriptor handling in 'libsi'
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--libsi/descriptor.c6
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 438d8275..08602fcc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -943,3 +943,4 @@ Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
Stéphane Esté-Gracias <sestegra@free.fr>
for fixing a typo in libsi/si.h
+ for fixing some descriptor handling in 'libsi'
diff --git a/HISTORY b/HISTORY
index f4dbc36a..fdcf78f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2717,3 +2717,4 @@ Video Disk Recorder Revision History
2004-03-05: Version 1.3.6
- Completed the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed some descriptor handling in 'libsi' (thanks to Stéphane Esté-Gracias).
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 0b0019f8..b552ae7c 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * $Id: descriptor.c 1.6 2004/02/22 11:11:36 kls Exp $
+ * $Id: descriptor.c 1.7 2004/03/05 15:17:33 kls Exp $
* *
***************************************************************************/
@@ -148,7 +148,7 @@ void TimeShiftedEventDescriptor::Parse() {
void ContentDescriptor::Parse() {
//this descriptor is only a header and a loop
- nibbleLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+ nibbleLoop.setData(data+sizeof(descr_content), getLength()-sizeof(descr_content));
}
int ContentDescriptor::Nibble::getContentNibbleLevel1() const {
@@ -173,7 +173,7 @@ void ContentDescriptor::Nibble::Parse() {
void ParentalRatingDescriptor::Parse() {
//this descriptor is only a header and a loop
- ratingLoop.setData(data+sizeof(SectionHeader), getLength()-sizeof(SectionHeader));
+ ratingLoop.setData(data+sizeof(descr_parental_rating), getLength()-sizeof(descr_parental_rating));
}
int ParentalRatingDescriptor::Rating::getRating() const {