]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
subscription: fix the assert from the last cleanup
authorJaroslav Kysela <perex@perex.cz>
Fri, 13 Mar 2015 14:55:30 +0000 (15:55 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 13 Mar 2015 14:55:30 +0000 (15:55 +0100)
src/subscriptions.c

index 9b89b656371a88e8b9c4342077f3ca03ab7b45db..8af33476aa7340e8a751bbb3522bfad0fde175c8 100644 (file)
@@ -584,10 +584,8 @@ subscription_create
 
   TAILQ_INIT(&s->ths_instances);
 
-  assert(flags & (SUBSCRIPTION_NONE|SUBSCRIPTION_MPEGTS|SUBSCRIPTION_PACKET));
-
   switch (flags & SUBSCRIPTION_TYPE_MASK) {
-  default:
+  case SUBSCRIPTION_NONE:
     reject |= SMT_TO_MASK(SMT_PACKET) | SMT_TO_MASK(SMT_MPEGTS);
     break;
   case SUBSCRIPTION_MPEGTS:
@@ -596,6 +594,8 @@ subscription_create
   case SUBSCRIPTION_PACKET:
     reject |= SMT_TO_MASK(SMT_MPEGTS);  // Reject raw mpegts
     break;
+  default:
+    abort();
   }
 
   if (!cb) cb = subscription_input_direct;