diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
| commit | 17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a (patch) | |
| tree | fc7a92c2f3ca24c21891ec54f1ebb5785fc56487 /client | |
| parent | 58a4f3dbe5888d6da81b401154a8b4c778ff228a (diff) | |
| parent | 1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3 (diff) | |
| download | vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.gz vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.bz2 | |
Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-streamdev
Conflicts:
HISTORY
Diffstat (limited to 'client')
| -rw-r--r-- | client/device.c | 2 | ||||
| -rw-r--r-- | client/streamdev-client.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/client/device.c b/client/device.c index 9e78f80..7f39bbe 100644 --- a/client/device.c +++ b/client/device.c @@ -49,9 +49,7 @@ cStreamdevDevice::~cStreamdevDevice() { Cancel(3); -#if APIVERSNUM >= 10515 StopSectionHandler(); -#endif DELETENULL(m_Filters); DELETENULL(m_TSBuffer); } diff --git a/client/streamdev-client.c b/client/streamdev-client.c index 00fa90c..62c57bd 100644 --- a/client/streamdev-client.c +++ b/client/streamdev-client.c @@ -10,8 +10,8 @@ #include "client/device.h" #include "client/setup.h" -#if !defined(APIVERSNUM) || APIVERSNUM < 10509 -#error "VDR-1.5.9 API version or greater is required!" +#if !defined(APIVERSNUM) || APIVERSNUM < 10516 +#error "VDR-1.5.16 API version or greater is required!" #endif const char *cPluginStreamdevClient::DESCRIPTION = trNOOP("VTP Streaming Client"); |