cwc/cccam: compilation fix for previous change

diff --git a/src/descrambler/cccam.c b/src/descrambler/cccam.c
index 9a708ff2085e4410028a0f58e5fd568412c4b834..5b96d14da6a730b6d50907ad03e3fc6a4d68f7b5 100644 (file)
--- a/src/descrambler/cccam.c
+++ b/src/descrambler/cccam.c
@@ -1,4 +1,4 @@
-/*
+  /*
  *  tvheadend, CCCAM interface
  *  Copyright (C) 2007 Andreas Öman
  *  Copyright (C) 2017 Luis Alves
@@ -1594,7 +1594,6 @@ static void
 cccam_service_destroy0(th_descrambler_t *td)
 {
   cccam_service_t *ct = (cccam_service_t *)td;
-  cccam_t *cccam = ct->cs_cccam;
   int i;
 
   for (i = 0; i < CCCAM_ES_PIDS; i++)
@@ -1618,6 +1617,9 @@ cccam_service_destroy0(th_descrambler_t *td)
 static void
 cccam_service_destroy(th_descrambler_t *td)
 {
+  cccam_service_t *ct = (cccam_service_t *)td;
+  cccam_t *cccam = ct->cs_cccam;
+
   pthread_mutex_lock(&cccam->cccam_mutex);
   cccam_service_destroy0(td);
   pthread_mutex_unlock(&cccam->cccam_mutex);

diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index 32f62e9912e9b63595765d0c4ff0c4029e4c9615..ee00cf01fea03d9c16eb7995c6daa620811c1e1f 100644 (file)
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -1520,7 +1520,7 @@ static void
 cwc_service_destroy0(th_descrambler_t *td)
 {
   cwc_service_t *ct = (cwc_service_t *)td;
-  cwc_t *cwc = ct->cs_cwc;
+  int i;
 
   for (i = 0; i < CWC_ES_PIDS; i++)
     if (ct->cs_epids[i])
@@ -1543,6 +1543,9 @@ cwc_service_destroy0(th_descrambler_t *td)
 static void
 cwc_service_destroy(th_descrambler_t *td)
 {
+  cwc_service_t *ct = (cwc_service_t *)td;
+  cwc_t *cwc = ct->cs_cwc;
+
   pthread_mutex_lock(&cwc->cwc_mutex);
   cwc_service_destroy0(td);
   pthread_mutex_unlock(&cwc->cwc_mutex);