]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
dvbcam: ddci - open cat monitor outside mutexes
authorJaroslav Kysela <perex@perex.cz>
Sat, 18 Nov 2017 07:54:51 +0000 (08:54 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sat, 18 Nov 2017 07:54:51 +0000 (08:54 +0100)
src/descrambler/dvbcam.c

index 88606c4e6c7b467eae8868ef5aad8362241f52f5..9c866ebd3dd8fb03e8ce7d4392fc34193f5500bc 100644 (file)
@@ -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);
     }
   }
 }