From 797dc12c3ca8817b998e0fd7b3dcc2da1ae846b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Thu, 17 Jun 2010 19:00:40 +0000
Subject: [PATCH] Avoid signalling descrambler/access errors if we trigged
 descrambling and the packet was damaged

---
 src/tsdemux.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tsdemux.c b/src/tsdemux.c
index 51d494ab..555d05fa 100644
--- a/src/tsdemux.c
+++ b/src/tsdemux.c
@@ -249,11 +249,14 @@ ts_recv_packet1(th_transport_t *t, const uint8_t *tsb, int64_t *pcrp)
 	m++;
     }
 
-    if(n == 0) {
-      transport_set_streaming_status_flags(t, TSS_NO_DESCRAMBLER);
-    } else if(m == n) {
-      transport_set_streaming_status_flags(t, TSS_NO_ACCESS);
+    if(!error) {
+      if(n == 0) {
+	transport_set_streaming_status_flags(t, TSS_NO_DESCRAMBLER);
+      } else if(m == n) {
+	transport_set_streaming_status_flags(t, TSS_NO_ACCESS);
+      }
     }
+
   } else {
     ts_recv_packet0(t, st, tsb);
   }