From d83aefe0fe7541a3203d510d0e8ed303bbb79803 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 24 Jan 2015 20:22:29 +0100 Subject: [PATCH] descrambler: fix mm_descrambler_lock deadlock in the CAT callback, fixes #2636 --- src/descrambler/descrambler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c index b97c25d4..e65848ac 100755 --- a/src/descrambler/descrambler.c +++ b/src/descrambler/descrambler.c @@ -747,7 +747,7 @@ next: caid = emm->caid; pid = emm->pid; tvhtrace("descrambler", "close emm caid %04X (%i) pid %04X (%i)", caid, caid, pid, pid); - descrambler_close_pid(mux, emm->opaque, pid); + descrambler_close_pid_(mux, emm->opaque, pid); } TAILQ_REMOVE(&mux->mm_descrambler_emms, emm, link); TAILQ_INSERT_TAIL(&removing, emm, link);