Changeset e52344487901654530cb4b1333d0f0db06a3eb5d

Show
Ignore:
Timestamp:
05/13/05 16:16:03 (3 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1115993763 +0000
git-parent:

[9024ec1d1fa843e0076dfb341ac9ed212ebee30e]

git-author:
Gildas Bazin <gbazin@videolan.org> 1115993763 +0000
Message:

* modules/demux/ts.c: keep compatibility with non-DVB streams (SDT/EDT issue).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/ts.c

    r16b435f re523444  
    24212421        if( !old_pid && p_sys->pid[p_es->i_pid].b_valid ) 
    24222422        { 
    2423             msg_Warn( p_demux, "pmt error: pid=%d already defined", 
    2424                       p_es->i_pid ); 
    2425             continue; 
     2423            ts_pid_t *pid = &p_sys->pid[p_es->i_pid]; 
     2424            if( ( pid->i_pid == 0x11 /* SDT */ || 
     2425                  pid->i_pid == 0x12 /* EDT */ ) && pid->psi ) 
     2426            { 
     2427                /* This doesn't look like a DVB stream so don't try 
     2428                 * parsing the SDT/EDT */ 
     2429                dvbpsi_DetachDemux( pid->psi->handle ); 
     2430                free( pid->psi ); 
     2431                pid->psi = 0; 
     2432            } 
     2433            else 
     2434            { 
     2435                msg_Warn( p_demux, "pmt error: pid=%d already defined", 
     2436                          p_es->i_pid ); 
     2437                continue; 
     2438            } 
    24262439        } 
    24272440