summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2011-08-26 12:44:21 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2011-08-26 12:44:21 +0200
commit2d3cb812fbcf038cf14a792c375fd866b6420a10 (patch)
tree9ee93e856f6c2188491c72b224b04e48c128ae8b /channels.c
parentd00941c1fdcd6978e83cab46252a0936c9510f91 (diff)
downloadvdr-2d3cb812fbcf038cf14a792c375fd866b6420a10.tar.gz
vdr-2d3cb812fbcf038cf14a792c375fd866b6420a10.tar.bz2
Moved scanning tpid back to where Rolf Ahrenberg's patch originally did it
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index b585151a..b9204f28 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.18 2011/08/21 14:13:54 kls Exp $
+ * $Id: channels.c 2.19 2011/08/26 12:44:21 kls Exp $
*/
#include "channels.h"
@@ -656,8 +656,6 @@ bool cChannel::Parse(const char *s)
dpids[NumDpids] = 0;
dtypes[NumDpids] = 0;
}
- if (sscanf(tpidbuf, "%d", &tpid) != 1)
- return false;
int NumSpids = 0;
if ((p = strchr(tpidbuf, ';')) != NULL) {
*p++ = 0;
@@ -680,6 +678,8 @@ bool cChannel::Parse(const char *s)
}
spids[NumSpids] = 0;
}
+ if (sscanf(tpidbuf, "%d", &tpid) != 1)
+ return false;
if (caidbuf) {
char *p = caidbuf;
char *q;