[vlc-commits] demux: ts: delay sdt handling until es are created

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Feb 20 19:44:14 2015 +0100| [4659b3dbc2c63366004ca2f702db29ccfcdedf5a] | committer: Francois Cartegnie

demux: ts: delay sdt handling until es are created

refs #6175
If sdt appears prior pmt/es, the group from first
SET_GROUP_META call overrides default selection.

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

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

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 35aa6f7..68487ac 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -3416,9 +3416,9 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
 
     msg_Dbg( p_demux, "SDTCallBack called" );
 
-    if( sdt->psi->i_sdt_version != -1 &&
-        ( !p_sdt->b_current_next ||
-          p_sdt->i_version == sdt->psi->i_sdt_version ) )
+    if( p_sys->b_delay_es_creation ||
+       !p_sdt->b_current_next ||
+        p_sdt->i_version == sdt->psi->i_sdt_version )
     {
         dvbpsi_DeleteSDT( p_sdt );
         return;