[vlc-commits] demux: ts: directly ignore scrambled content

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar 13 17:45:56 2015 +0100| [f9833ec8c61c14810b428f9af14b05487e7511a3] | committer: Francois Cartegnie

demux: ts: directly ignore scrambled content

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f9833ec8c61c14810b428f9af14b05487e7511a3
---

 modules/demux/ts.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index cdea676..95d1fd2 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1298,6 +1298,12 @@ static int Demux( demux_t *p_demux )
             p_pid->i_flags |= FLAG_SEEN;
         }
 
+        if ( SCRAMBLED(*p_pid) && !p_demux->p_sys->csa )
+        {
+            block_Release( p_pkt );
+            continue;
+        }
+
         /* Probe streams to build PAT/PMT after MIN_PAT_INTERVAL in case we don't see any PAT */
         if( !SEEN(p_sys->pid[0]) &&
             (p_pid->probed.i_type == 0 || p_pid->i_pid == p_sys->patfix.i_timesourcepid) &&