fix m3u parser (EXTINF attributes)

diff --git a/src/input/mpegts/iptv/iptv_auto.c b/src/input/mpegts/iptv/iptv_auto.c
index a62001d56798f756645dafa97e0b42a9f04e6a46..4f4370ef54af0b5554b9c987624700f29d9ea55c 100644 (file)
--- 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
index d567240cb47d2c4575c3c4270edc792f87b2c4a6..4836bcfc4eb496b5f3df170fa4008ff6e57b4eeb 100644 (file)
--- 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;