Changeset 1ebdbd04e56816857e31a2fab2a3bed1405df827

Show
Ignore:
Timestamp:
13/11/02 21:23:21 (6 years ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1037219001 +0000
git-parent:

[5de3e045e3d5cae53d526d2c6898926a7f1e43c9]

git-author:
Laurent Aimar <fenrir@videolan.org> 1037219001 +0000
Message:

access/* : don't override demux setting made by user.
modules/demux/demuxdump.c : a little demux that dump raw stream.

(should work with all access...)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac.in

    r669c88b r1ebdbd0  
    585585PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga" 
    586586PLUGINS="${PLUGINS} id3 m3u" 
    587 PLUGINS="${PLUGINS} wav araw" 
     587PLUGINS="${PLUGINS} wav araw demuxdump" 
    588588 
    589589dnl 

  • modules/access/dvd/access.c

    rd532cf3 r1ebdbd0  
    99 ***************************************************************************** 
    1010 * Copyright (C) 1998-2001 VideoLAN 
    11  * $Id: access.c,v 1.4 2002/11/08 10:26:52 gbazin Exp $ 
     11 * $Id: access.c,v 1.5 2002/11/13 20:23:21 fenrir Exp $ 
    1212 * 
    1313 * Author: St�ane Borel <stef@via.ecp.fr> 
    …… 
    253253    vlc_mutex_unlock( &p_input->stream.stream_lock ); 
    254254 
    255     p_input->psz_demux = "dvdold"; 
     255    if( !p_input->psz_demux || !*p_input->psz_demux ) 
     256    { 
     257        p_input->psz_demux = "dvdold"; 
     258    } 
    256259 
    257260    return 0; 

  • modules/access/dvdplay/access.c

    r8b09b55 r1ebdbd0  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001 VideoLAN 
    5  * $Id: access.c,v 1.5 2002/11/06 18:07:57 sam Exp $ 
     5 * $Id: access.c,v 1.6 2002/11/13 20:23:21 fenrir Exp $ 
    66 * 
    77 * Author: St�ane Borel <stef@via.ecp.fr> 
    …… 
    183183    vlc_mutex_unlock( &p_input->stream.stream_lock ); 
    184184 
    185     p_input->psz_demux = "dvdplay"; 
     185    if( !p_input->psz_demux || !*p_input->psz_demux ) 
     186    { 
     187        p_input->psz_demux = "dvdplay"; 
     188    } 
    186189 
    187190    /* FIXME: we might lose variables here */ 

  • modules/access/dvdread/input.c

    rd532cf3 r1ebdbd0  
    77 ***************************************************************************** 
    88 * Copyright (C) 2001 VideoLAN 
    9  * $Id: input.c,v 1.8 2002/11/08 10:26:52 gbazin Exp $ 
     9 * $Id: input.c,v 1.9 2002/11/13 20:23:21 fenrir Exp $ 
    1010 * 
    1111 * Author: St�ane Borel <stef@via.ecp.fr> 
    …… 
    420420    vlc_mutex_unlock( &p_input->stream.stream_lock ); 
    421421 
    422     p_input->psz_demux = "dvdread"; 
     422    if( !p_input->psz_demux || !*p_input->psz_demux ) 
     423    { 
     424        p_input->psz_demux = "dvdread"; 
     425    } 
    423426 
    424427    return 0; 

  • modules/access/rtp.c

    rdf7cbb7 r1ebdbd0  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: rtp.c,v 1.5 2002/11/12 13:57:12 sam Exp $ 
     5 * $Id: rtp.c,v 1.6 2002/11/13 20:23:21 fenrir Exp $ 
    66 * 
    77 * Authors: Tristan Leteurtre <tooney@via.ecp.fr> 
    …… 
    269269    p_access_data->i_handle = socket_desc.i_handle; 
    270270    p_input->i_mtu = socket_desc.i_mtu; 
    271  
    272     p_input->psz_demux = "ts"; 
     271    if( !p_input->psz_demux || !*p_input->psz_demux ) 
     272    { 
     273        p_input->psz_demux = "ts"; 
     274    } 
    273275     
    274276    return( 0 ); 

  • modules/access/vcd/vcd.c

    r2401b66 r1ebdbd0  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000 VideoLAN 
    5  * $Id: vcd.c,v 1.10 2002/11/06 15:41:29 jobi Exp $ 
     5 * $Id: vcd.c,v 1.11 2002/11/13 20:23:21 fenrir Exp $ 
    66 * 
    77 * Author: Johan Bilien <jobi@via.ecp.fr> 
    …… 
    258258    vlc_mutex_unlock( &p_input->stream.stream_lock ); 
    259259 
    260     p_input->psz_demux = "ps"; 
     260    if( !p_input->psz_demux || !*p_input->psz_demux ) 
     261    { 
     262        p_input->psz_demux = "ps"; 
     263    } 
    261264 
    262265    return 0; 

  • modules/demux/Modules.am

    r669c88b r1ebdbd0  
    22SOURCES_ogg = modules/demux/ogg.c 
    33SOURCES_m3u = modules/demux/m3u.c 
     4SOURCES_demuxdump = modules/demux/demuxdump.c