If a stream is scrambled, force packets through the descrambler even if that particul...

Fixes out-of-order problems.

diff --git a/src/tsdemux.c b/src/tsdemux.c
index e6b018469a8116bf99acf0cf2f2aa5733502b8e7..9bd68c56ffd88c4b8849f62b4e171f5eb0051f71 100644 (file)
--- a/src/tsdemux.c
+++ b/src/tsdemux.c
@@ -209,7 +209,10 @@ ts_recv_packet1(th_transport_t *t, uint8_t *tsb)
     ts_extract_pcr(t, st, tsb);
 
 
-  if(tsb[3] & 0xc0) {
+  if((tsb[3] & 0xc0) ||
+      (t->tht_scrambled && st->st_type != SCT_CA &&
+       st->st_type != SCT_PAT && st->st_type != SCT_PMT)) {
+
     /* scrambled stream */
     n = m = 0;