[vlc-commits] demux: ts: gather data for uncreated es

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Mar 17 22:38:56 2015 +0100| [b8f858f4174b41bf5f39a775ec3839d3075f0b36] | committer: Francois Cartegnie

demux: ts: gather data for uncreated es

should go to pre es queue otherwise first frames/gop are dropped

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

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

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 9db9667..9b219aa 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -2347,7 +2347,7 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
             if( p_pmt->pcr.i_first == -1 ) /* Not seen yet */
                 PCRFixHandle( p_demux, p_pmt, p_block );
 
-            if( p_pmt->pcr.i_current > -1 || p_pmt->pcr.b_disable )
+            if( pid->u.p_pes->es.id && (p_pmt->pcr.i_current > -1 || p_pmt->pcr.b_disable) )
             {
                 if( pid->u.p_pes->p_prepcr_outqueue )
                 {
@@ -3179,7 +3179,7 @@ static bool GatherData( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
 
     PCRHandle( p_demux, pid, p_bk );
 
-    if( i_skip >= 188 || pid->u.p_pes->es.id == NULL )
+    if( i_skip >= 188 )
     {
         block_Release( p_bk );
         return i_ret;