]> git.sesse.net Git - vlc/commitdiff
demux: ts: delay sdt handling until es are created
authorFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 20 Feb 2015 18:44:14 +0000 (19:44 +0100)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 20 Feb 2015 18:49:04 +0000 (19:49 +0100)
refs #6175
If sdt appears prior pmt/es, the group from first
SET_GROUP_META call overrides default selection.

modules/demux/ts.c

index 35aa6f754c2ba7c079ca642ce445a6f37a92fd82..68487ac4498ceb1a193d319c897217f3772b8c83 100644 (file)
@@ -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;