TS demux: partially revert 8eb0b3d3b53c29b3495dcac275b5fe51f7633a6b

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

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 9c75a450280c9a10799508e40ec8813ff89177db..a90d3211ffda6573943912506b7de5835deb380f 100644 (file)
--- 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 );
     }