* forwardport [15373] which was left accidently hanging in the 0.8.5 branch

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 5d3a43acf4496f38663669987d04b845b8d137b9..37fa347abf9675c2a31846d302d004980a1f4587 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -973,7 +973,7 @@ static int DemuxFile( demux_t *p_demux )
         i_diff = ( i_cc - p_pid->i_cc )&0x0f;
         if( b_payload && i_diff == 1 )
         {
-            p_pid->i_cc++;
+            p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf;
         }
         else
         {
@@ -1782,7 +1782,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
     i_diff = ( i_cc - pid->i_cc )&0x0f;
     if( b_payload && i_diff == 1 )
     {
-        pid->i_cc++;
+        pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
     }
     else
     {