Changeset a4385eef49a66fb51619e210ecc1a0a3c6a95fbd

Show
Ignore:
Timestamp:
08/08/04 03:58:59 (4 years ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1091930339 +0000
git-parent:

[01d4b42206fc4cdb6cc1e25f61f7eab42bac35d9]

git-author:
Laurent Aimar <fenrir@videolan.org> 1091930339 +0000
Message:
  • demux: another way to break your config file, or, --demux is now taken

into acount. (to make bigben happy, being able to do :demux=dump ;)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/input/demux.c

    r55d2561 ra4385ee  
    4949    p_demux->psz_path   = strdup( psz_path ); 
    5050 
     51    /* Take into account "demux" to be able to do :demux=demuxdump */ 
     52    if( *p_demux->psz_demux == '\0' ) 
     53    { 
     54        free( p_demux->psz_demux ); 
     55        p_demux->psz_demux = var_GetString( p_obj, "demux" ); 
     56    } 
     57 
    5158    msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'", 
    5259             p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );