fix m3u parser (EXTINF attributes)

tvheadend · Nov 12, 2015 · 7173bba · 7173bba
1 parent 9dc4e45
commit 7173bba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/input/mpegts/iptv/iptv_auto.c b/src/input/mpegts/iptv/iptv_auto.c
@@ -72,7 +72,7 @@ iptv_auto_network_process_m3u_item(iptv_network_t *in,
 
   epgid = htsmsg_get_str(item, "tvh-chnum");
   chnum2 = epgid ? prop_intsplit_from_str(epgid, CHANNEL_SPLIT) : 0;
-  if (chnum2) {
+  if (chnum2 > 0) {
     chnum += chnum2;
   } else if (chnum) {
     if (chnum % CHANNEL_SPLIT)

diff --git a/src/misc/m3u.c b/src/misc/m3u.c
@@ -143,7 +143,10 @@ htsmsg_t *parse_m3u
       }
       p = NULL;
       if (*data == ',') {
+        delim = ',';
         data++;
+      }
+      if (delim == ',') {
         while (*data && *data <= ' ' && *data != '\n' && *data != '\r') data++;
         if (*data)
           p = data;