[vlc-commits] TS demux: partially revert 8eb0b3d3b53c29b3495dcac275b5fe51f7633a6b

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jul 11 14:25:08 2014 +0200| [5478a4d90b357c81b8e01f337aca0b9bb682605d] | committer: Rafaël Carré

TS demux: partially revert 8eb0b3d3b53c29b3495dcac275b5fe51f7633a6b

Using both PCR and ES PTS seems to cause problems in some cases

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

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

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 9c75a45..a90d321 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 ) );
         }
 
-        es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
-                pid->i_owner_number, p_block->i_pts);
+        if (!p_sys->b_trust_pcr)
+            es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
+                    pid->i_owner_number, p_block->i_pts);
 
         es_out_Send( p_demux->out, pid->es->id, p_block );
     }