summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2014-09-19 15:23:14 +0200
committerFrank Schmirler <vdr@schmirler.de>2014-09-19 15:23:14 +0200
commitdd556ee7fdaea2ade54e9b6c383f44fa88a483f8 (patch)
tree08962410adcbfeb9884548e18549f8a90e30161f
parent58f0348578da0707ae83deb433d6e7c5f01577c1 (diff)
downloadvdr-plugin-streamdev-dd556ee7fdaea2ade54e9b6c383f44fa88a483f8.tar.gz
vdr-plugin-streamdev-dd556ee7fdaea2ade54e9b6c383f44fa88a483f8.tar.bz2
Don't abort externremux when internal read buffer is empty
-rw-r--r--HISTORY1
-rw-r--r--remux/extern.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index f71613f..6eec8d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- Don't abort externremux when internal read buffer is empty
- Implemented remuxing of recordings
- Make ChannelChange retune only if CA IDs changed (thanks to Oliver Wagner)
- Implemented VDR 2.1.4 cStatus::ChannelChange(...)
diff --git a/remux/extern.c b/remux/extern.c
index c3e6ad6..7786852 100644
--- a/remux/extern.c
+++ b/remux/extern.c
@@ -303,7 +303,7 @@ void cTSExt::Action(void)
dsyslog("streamdev-server: buffer full while reading from externremux");
if (result == -1) {
- if (errno != EINTR) {
+ if (errno != EINTR && errno != EAGAIN) {
LOG_ERROR_STR("read failed");
m_Active = false;
}