[vlc-commits] ts demux: fix no-ts-trust-pcr for MPTS

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jul  8 14:04:52 2014 +0200| [59aaa1995631d4a6770ca611ed3b12eca882a5f2] | committer: Jean-Baptiste Kempf

ts demux: fix no-ts-trust-pcr for MPTS

(cherry picked from commit 3fa29faf615cb9232c66f11b0f5571ec673bc8e4)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/ts.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 5edfbde..49ab933 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1732,8 +1732,9 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
                          block_Duplicate( p_block ) );
         }
 
-        if (!p_sys->b_trust_pcr)
+        if (!p_sys->b_trust_pcr && pid->i_owner_number == p_sys->i_current_program) {
             es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts);
+        }
 
         es_out_Send( p_demux->out, pid->es->id, p_block );
     }