From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 21 Feb 2017 09:14:16 +0000 (+0100)
Subject: tsdemux: export ts_recv_packet0() for the descrambler
X-Git-Tag: v4.2.1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a272f678840501f4a3a9e71e38b77d7ee8c1cc1c;p=thirdparty%2Ftvheadend.git

tsdemux: export ts_recv_packet0() for the descrambler
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index b0c9585e2..486032c29 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -693,7 +693,7 @@ descrambler_descramble ( service_t *t,
 
   if (dr == NULL || dr->dr_external) {
     if ((tsb[3] & 0x80) == 0) {
-      ts_recv_packet2((mpegts_service_t *)t, tsb, len);
+      ts_recv_packet0((mpegts_service_t *)t, st, tsb, len);
       return 1;
     }
     return dr && dr->dr_external ? 1 : -1;
@@ -701,7 +701,7 @@ descrambler_descramble ( service_t *t,
 
   if (dr->dr_csa.csa_type == DESCRAMBLER_NONE && dr->dr_queue_total == 0)
     if ((tsb[3] & 0x80) == 0) {
-      ts_recv_packet2((mpegts_service_t *)t, tsb, len);
+      ts_recv_packet0((mpegts_service_t *)t, st, tsb, len);
       return 1;
     }
 
diff --git a/src/input/mpegts/tsdemux.c b/src/input/mpegts/tsdemux.c
index bd4e6cd1d..e4f6e8868 100644
--- a/src/input/mpegts/tsdemux.c
+++ b/src/input/mpegts/tsdemux.c
@@ -48,7 +48,7 @@ static void ts_skip(mpegts_service_t *t, const uint8_t *tsb, int len);
 /**
  * Continue processing of transport stream packets
  */
-static void
+void
 ts_recv_packet0
   (mpegts_service_t *t, elementary_stream_t *st, const uint8_t *tsb, int len)
 {
diff --git a/src/input/mpegts/tsdemux.h b/src/input/mpegts/tsdemux.h
index 5fb82ac75..f726013c3 100644
--- a/src/input/mpegts/tsdemux.h
+++ b/src/input/mpegts/tsdemux.h
@@ -21,6 +21,9 @@
 
 int ts_resync ( const uint8_t *tsb, int *len, int *idx );
 
+void ts_recv_packet0
+  (struct mpegts_service *t, elementary_stream_t *st, const uint8_t *tsb, int len);
+
 int ts_recv_packet1
   (struct mpegts_service *t, const uint8_t *tsb, int len, int table);