summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmirl <schmirl>2008-10-13 11:30:05 +0000
committerschmirl <schmirl>2008-10-13 11:30:05 +0000
commit992444cb67e700619293d3642f95f40b18d1b62e (patch)
tree433a6974dc0cfdb4c6211ad9740680a59370b1c0
parentc5b5a4cbeb26d30d62a9afd66a29eb69723fd81f (diff)
downloadvdr-plugin-streamdev-992444cb67e700619293d3642f95f40b18d1b62e.tar.gz
vdr-plugin-streamdev-992444cb67e700619293d3642f95f40b18d1b62e.tar.bz2
Compatibility to VDR 1.7.1 (#483)
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--client/filter.c3
-rw-r--r--remux/tsremux.c3
-rw-r--r--server/livestreamer.c7
-rw-r--r--streamdev-server.c4
6 files changed, 12 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c78f69c..d7c0647 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -44,6 +44,7 @@ Udo Richter
for fixing streamdev-server shutdown
for speeding up cPluginStreamdevServer::Active()
for adapting to VDR 1.5.0 API
+ for adapting to VDR 1.7.1
greenman
for reporting that the log could get flooded on connection failures.
diff --git a/HISTORY b/HISTORY
index f20b10c..aea9d78 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- compatibility for VDR 1.7.1 (thanks to Udo Richter)
- added vdr-1.6.0-intcamdevices.patch (thanks to Anssi Hannula)
- fixed problem when switching from one encrypted channel to an other
(reported by Tiroler@vdrportal, initial bugfix by pixelpeter@vdrportal)
diff --git a/client/filter.c b/client/filter.c
index 335e07b..e88defa 100644
--- a/client/filter.c
+++ b/client/filter.c
@@ -1,5 +1,5 @@
/*
- * $Id: filter.c,v 1.12 2008/04/07 14:27:28 schmirl Exp $
+ * $Id: filter.c,v 1.13 2008/10/13 11:30:06 schmirl Exp $
*/
#include "client/filter.h"
@@ -9,6 +9,7 @@
#include <vdr/device.h>
+#define PID_MASK_HI 0x1F
// --- cStreamdevFilter ------------------------------------------------------
class cStreamdevFilter: public cListObject {
diff --git a/remux/tsremux.c b/remux/tsremux.c
index 6be5245..c73c2fe 100644
--- a/remux/tsremux.c
+++ b/remux/tsremux.c
@@ -1,6 +1,7 @@
#include "remux/tsremux.h"
-#define SC_PICTURE 0x00 // "picture header"
+#define SC_PICTURE 0x00 // "picture header"
+#define PID_MASK_HI 0x1F
void cTSRemux::SetBrokenLink(uchar *Data, int Length)
{
diff --git a/server/livestreamer.c b/server/livestreamer.c
index dd65e65..7ea9268 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -3,13 +3,14 @@
#include <libsi/section.h>
#include <libsi/descriptor.h>
+#include "remux/ts2ps.h"
+#include "remux/ts2es.h"
+#include "remux/extern.h"
+
#include <vdr/ringbuffer.h>
#include "server/livestreamer.h"
#include "server/livefilter.h"
-#include "remux/ts2ps.h"
-#include "remux/ts2es.h"
-#include "remux/extern.h"
#include "common.h"
#define TSPATREPACKER
diff --git a/streamdev-server.c b/streamdev-server.c
index b2c178a..9892cb2 100644
--- a/streamdev-server.c
+++ b/streamdev-server.c
@@ -3,15 +3,15 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: streamdev-server.c,v 1.9 2008/04/29 07:00:53 schmirl Exp $
+ * $Id: streamdev-server.c,v 1.10 2008/10/13 11:30:05 schmirl Exp $
*/
#include <getopt.h>
+#include "remux/extern.h"
#include "streamdev-server.h"
#include "server/setup.h"
#include "server/server.h"
#include "server/suspend.h"
-#include "remux/extern.h"
#if !defined(APIVERSNUM) || APIVERSNUM < 10509
#error "VDR-1.5.9 API version or greater is required!"