Changeset 89ee60c17afe2e97a2e9d435720d3435b657145a

Show
Ignore:
Timestamp:
16/12/02 00:39:41 (6 years ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1039995581 +0000
git-parent:

[4c0de20eff23a7b91749815aa2b5d8a19062c0ff]

git-author:
Laurent Aimar <fenrir@videolan.org> 1039995581 +0000
Message:
  • modules/mux/mpeg/*: should fix builtin compilation
  • modules/access/ftp.c : an ftp access, buggy but it begins to work.

The main issue is about password confidentiality so you must know
what you are doing :((

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • AUTHORS

    r84ae579 r89ee60c  
    1010E: fenrir@via.ecp.fr 
    1111C: fenrir 
    12 D: AVI demultiplexer 
    13 D: MPEG-4, Div & OpenDivX decoder (ffmpeg) 
     12D: avi, asf/wmv/wma, mp4/mov, mp3, aac, wav demultiplexers 
     13D: MPEG-4, Div & OpenDivX and various decoders (ffmpeg) 
     14D: AAC decoder (libfaad2) 
     15D: cinepak, adpcm, araw decoders 
     16D: Subtile file parser. 
     17D: mms, ftp access 
     18D: Stream output 
    1419S: France 
    1520 
    …… 
    369374C: titer 
    370375D: BeOS module fixes and enhancements 
     376D: Stream output 
    371377S: France 
    372378 

  • configure.ac.in

    r44656b9 r89ee60c  
    136136        LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lws2_32" 
    137137        LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32" 
     138        LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32" 
    138139        LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32" 
    139140        LDFLAGS_rc="${LDFLAGS_rc} -lws2_32" 
    …… 
    274275    LDFLAGS_access_rtp="${LDFLAGS_access_rtp} -lsocket" 
    275276    LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket" 
     277    LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket" 
    276278    LDFLAGS_sap="${LDFLAGS_sap} -lsocket" 
    277279    LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket" 
    …… 
    698700PLUGINS="${PLUGINS} id3 m3u" 
    699701PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm" 
    700 PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap" 
     702PLUGINS="${PLUGINS} access_udp access_http access_rtp ipv4 access_mms sap access_ftp" 
    701703 
    702704dnl 

  • modules/access/Modules.am

    r8641281 r89ee60c  
    33SOURCES_access_http = modules/access/http.c 
    44SOURCES_access_rtp = modules/access/rtp.c 
     5SOURCES_access_ftp = modules/access/ftp.c 

  • modules/mux/mpeg/pes.c

    rf8bf106 r89ee60c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: pes.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $ 
     5 * $Id: pes.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    4747#include "bits.h" 
    4848 
    49 int EStoPES( sout_instance_t *p_sout, 
    50              sout_buffer_t **pp_pes, 
    51              sout_buffer_t *p_es, 
    52              int i_stream_id, 
    53              int b_mpeg2 ) 
     49int E_( EStoPES )( sout_instance_t *p_sout, 
     50                   sout_buffer_t **pp_pes, 
     51                   sout_buffer_t *p_es, 
     52                   int i_stream_id, 
     53                   int b_mpeg2 ) 
    5454{ 
    5555    sout_buffer_t *p_pes; 

  • modules/mux/mpeg/pes.h

    rf8bf106 r89ee60c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: pes.h,v 1.1 2002/12/14 21:32:41 fenrir Exp $ 
     5 * $Id: pes.h,v 1.2 2002/12/15 23:39:41 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    3434 
    3535 
    36 int EStoPES( sout_instance_t *p_sout, 
    37              sout_buffer_t **pp_pes, sout_buffer_t *p_es,  
    38              int i_stream_id, int b_mpeg2 ); 
     36int E_( EStoPES )( sout_instance_t *p_sout, 
     37                   sout_buffer_t **pp_pes, sout_buffer_t *p_es,  
     38                   int i_stream_id, int b_mpeg2 ); 

  • modules/mux/mpeg/ps.c

    rf8bf106 r89ee60c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: ps.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $ 
     5 * $Id: ps.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    351351 
    352352        p_data = sout_FifoGet( p_fifo ); 
    353         EStoPES( p_sout, &p_data, p_data, p_stream->i_stream_id, 1); 
     353        E_( EStoPES )( p_sout, &p_data, p_data, p_stream->i_stream_id, 1); 
    354354        p_sout->pf_write( p_sout, p_data ); 
    355355 

  • modules/mux/mpeg/ts.c

    rf8bf106 r89ee60c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: ts.c,v 1.1 2002/12/14 21:32:41 fenrir Exp $ 
     5 * $Id: ts.c,v 1.2 2002/12/15 23:39:41 fenrir Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    567567        i_length = p_data->i_length; 
    568568 
    569         EStoPES( p_sout, &p_data, p_data, p_stream->i_stream_id, 1); 
     569        E_( EStoPES )( p_sout, &p_data, p_data, p_stream->i_stream_id, 1); 
    570570        PEStoTS( p_sout, &p_data, p_data, p_stream ); 
    571571