From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 18 Nov 2017 07:54:51 +0000 (+0100)
Subject: dvbcam: ddci - open cat monitor outside mutexes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76b77e0a82a086b13dce3e124df89b9ffc965ab4;p=thirdparty%2Ftvheadend.git

dvbcam: ddci - open cat monitor outside mutexes
---

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index 88606c4e6..9c866ebd3 100644
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -427,11 +427,12 @@ end:
       pthread_mutex_lock(&t->s_stream_mutex);
       mpegts_input_open_pid(mi, mm, DVB_CAT_PID, MPS_SERVICE, MPS_WEIGHT_CAT, t, 0);
       ((mpegts_service_t *)t)->s_cat_opened = 1;
-      mpegts_input_open_cat_monitor(mm, (mpegts_service_t *)t);
       mpegts_input_open_service_pid(mi, mm, t,
                                     SCT_CA, c->pid, MPS_WEIGHT_CA, 1);
       pthread_mutex_unlock(&t->s_stream_mutex);
       pthread_mutex_unlock(&mi->mi_output_lock);
+      mpegts_input_open_cat_monitor(mm, (mpegts_service_t *)t);
+      mpegts_mux_update_pids(mm);
     }
   }
 }