From: spdfrk1 <spdfrk123456@gmail.com>
Date: Mon, 4 Aug 2014 20:26:52 +0000 (+0200)
Subject: sync with master
X-Git-Tag: v4.1~1660
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f581f6379cae90934633eecbda44d4ecdf5e99f6;p=thirdparty%2Ftvheadend.git

sync with master
---

diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index d800d7c90..aa937b9a1 100755
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -792,22 +792,17 @@ forbid:
       service_request_save((service_t*)t, 0);
     }
 
-
     tvhlog(LOG_DEBUG, "cwc",
-    "Received ECM reply%s for service \"%s\" "
-    "even: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x"
-    " odd: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x (seqno: %d "
-    "Req delay: %"PRId64" ms)",
-    chaninfo,
-    t->s_dvb_svcname,
-    msg[3 + 0], msg[3 + 1], msg[3 + 2], msg[3 + 3], msg[3 + 4],
-    msg[3 + 5], msg[3 + 6], msg[3 + 7], msg[3 + 8], msg[3 + 9],
-    msg[3 + 10],msg[3 + 11],msg[3 + 12],msg[3 + 13],msg[3 + 14],
-    msg[3 + 15],msg[3 + 16],msg[3 + 17],msg[3 + 18],msg[3 + 19],
-    msg[3 + 20],msg[3 + 21],msg[3 + 22],msg[3 + 23],msg[3 + 24],
-    msg[3 + 25],msg[3 + 26],msg[3 + 27],msg[3 + 28],msg[3 + 29],
-    msg[3 + 30],msg[3 + 31], seq, delay);
-
+	   "Received ECM reply%s for service \"%s\" "
+	   "even: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x"
+	   " odd: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x (seqno: %d "
+	   "Req delay: %"PRId64" ms)",
+	   chaninfo,
+	   t->s_dvb_svcname,
+	   msg[3 + 0], msg[3 + 1], msg[3 + 2], msg[3 + 3], msg[3 + 4],
+	   msg[3 + 5], msg[3 + 6], msg[3 + 7], msg[3 + 8], msg[3 + 9],
+	   msg[3 + 10],msg[3 + 11],msg[3 + 12],msg[3 + 13],msg[3 + 14],
+	   msg[3 + 15], seq, delay);
 
     if(ct->td_keystate != DS_RESOLVED)
       tvhlog(LOG_DEBUG, "cwc",
diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index ee6870f9a..de3ce11a8 100755
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -20,7 +20,7 @@
 #include "descrambler.h"
 #include "cwc.h"
 #include "capmt.h"
-#include "libaesdec/libaesdec.h"
+#include "ffdecsa/FFdecsa.h"
 #include "input.h"
 #include "tvhcsa.h"
 
@@ -88,7 +88,7 @@ descrambler_init ( void )
   capmt_init();
 #endif
 #if (ENABLE_CWC || ENABLE_CAPMT) && !ENABLE_DVBCSA
-  libaesdec_init();
+  ffdecsa_init();
 #endif
 }