--- linux/drivers/media/dvb/dvb-core/dvb_demux.c.orig	2013-12-17 19:33:14.710304660 +0000
+++ linux/drivers/media/dvb/dvb-core/dvb_demux.c	2013-12-17 19:43:34.226540530 +0000
@@ -426,25 +426,31 @@ static void dvb_dmx_swfilter_packet(stru
 		};
 	};
 
-	if (demux->cnt_storage && dvb_demux_tscheck) {
-		/* check pkt counter */
-		if (pid < MAX_PID) {
-			if (buf[1] & 0x80)
-				dprintk_tscheck("TEI detected. "
-						"PID=0x%x data1=0x%x\n",
-						pid, buf[1]);
+        if (buf[1] & 0x80) {
+                dprintk_tscheck("TEI detected. "
+                                "PID=0x%x data1=0x%x\n",
+                                pid, buf[1]);
+                /* data in this packet cant be trusted - drop it unless
+                 * module option dvb_demux_feed_err_pkts is set */
+                /*if (!dvb_demux_feed_err_pkts)
+                        return;*/
+        } else /* if TEI bit is set, pid may be wrong- skip pkt counter */
+                if (demux->cnt_storage && dvb_demux_tscheck) {
+                        /* check pkt counter */
+                        if (pid < MAX_PID) {
+                                if (buf[3] & 0x10)
+                                        demux->cnt_storage[pid] =
+                                                (demux->cnt_storage[pid] + 1) & 0xf;
 
-			if ((buf[3] & 0xf) != demux->cnt_storage[pid])
-				dprintk_tscheck("TS packet counter mismatch. "
-						"PID=0x%x expected 0x%x "
-						"got 0x%x\n",
-						pid, demux->cnt_storage[pid],
-						buf[3] & 0xf);
-
-			demux->cnt_storage[pid] = ((buf[3] & 0xf) + 1)&0xf;
-		};
-		/* end check */
-	};
+                                if ((buf[3] & 0xf) != demux->cnt_storage[pid]) {
+                                        dprintk_tscheck("TS packet counter mismatch. PID=0x%x expected 0x%x got 0x%x\n",
+                                                pid, demux->cnt_storage[pid],
+                                                buf[3] & 0xf);
+                                        demux->cnt_storage[pid] = buf[3] & 0xf;
+                                }
+                        }
+                        /* end check */
+                }
 
 	list_for_each_entry(feed, &demux->feed_list, list_head) {
 		if ((feed->pid != pid) && (feed->pid != 0x2000))