From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 14 Feb 2019 12:38:50 +0000 (+0100)
Subject: mpegts: pid subscription - fix wrong mps_type mpegts_mps_cmp(), fixes #5492
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d250fd96844532d0e382ef083ce2e15dadb59c4c;p=thirdparty%2Ftvheadend.git

mpegts: pid subscription - fix wrong mps_type mpegts_mps_cmp(), fixes #5492
---

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index db467283a..e7e1846e8 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -472,12 +472,9 @@ mpegts_input_stop_mux ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
 int
 mpegts_mps_cmp ( mpegts_pid_sub_t *a, mpegts_pid_sub_t *b )
 {
-  if (a->mps_type != b->mps_type) {
-    if (a->mps_type & MPS_SERVICE)
-      return 1;
-    else
-      return -1;
-  }
+  const int mask = MPS_SERVICE;
+  if ((a->mps_type & mask) != (b->mps_type & mask)) {
+    return (a->mps_type & mask) ? 1 : -1;
   if (a->mps_owner < b->mps_owner) return -1;
   if (a->mps_owner > b->mps_owner) return 1;
   return 0;