From a05f1b280d5d1619ee010f1a1eaec7feeecc82a5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 21 Nov 2017 16:46:24 +0100 Subject: [PATCH] tsdemux: pass always all data through descrambler, if the scrambling is active --- src/input/mpegts/tsdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/tsdemux.c b/src/input/mpegts/tsdemux.c index 3ba94052d..32d9ddd7a 100644 --- a/src/input/mpegts/tsdemux.c +++ b/src/input/mpegts/tsdemux.c @@ -328,7 +328,7 @@ ts_recv_packet1 service_set_streaming_status_flags((service_t*)t, TSS_INPUT_SERVICE); scrambled = t->s_scrambled_seen; - if(!t->s_scrambled_pass && ((tsb[3] & 0xc0) || (st && scrambled))) { + if(!t->s_scrambled_pass && ((tsb[3] & 0xc0) || scrambled)) { /** * Lock for descrambling, but only if packet was not in error @@ -371,8 +371,8 @@ ts_recv_packet2(mpegts_service_t *t, const uint8_t *tsb, int len) for ( ; len > 0; tsb += len2, len -= len2 ) { len2 = mpegts_word_count(tsb, len, 0xFF9FFFD0); pid = (tsb[1] & 0x1f) << 8 | tsb[2]; - if((st = service_stream_find((service_t*)t, pid)) != NULL) - ts_recv_packet0(t, st, tsb, len2); + st = service_stream_find((service_t*)t, pid); + ts_recv_packet0(t, st, tsb, len2); } } -- 2.47.3