[vlc-commits] demux: ts: set delayed es if preparsed

Francois Cartegnie git at videolan.org
Wed Feb 25 20:11:09 CET 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Feb 25 20:09:32 2015 +0100| [b0d0fc3640bdb6520dcecaf0d26a4b0a5903646c] | committer: Francois Cartegnie

demux: ts: set delayed es if preparsed

Avoids never creating es when access_control is seekable
(should never be the case anyway)

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

 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 4603f2d..f700054 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1197,9 +1197,10 @@ static int Open( vlc_object_t *p_this )
         while( !p_sys->i_pmt_es && !p_sys->b_end_preparse )
             if( Demux( p_demux ) != VLC_DEMUXER_SUCCESS )
                 break;
+        p_sys->es_creation = DELAY_ES;
     }
-
-    p_sys->es_creation = ( p_sys->b_access_control ? CREATE_ES : DELAY_ES );
+    else
+        p_sys->es_creation = ( p_sys->b_access_control ? CREATE_ES : DELAY_ES );
 
     return VLC_SUCCESS;
 }



More information about the vlc-commits mailing list