* all: fixed some stupid bugs.

diff --git a/modules/misc/httpd.c b/modules/misc/httpd.c
index a206cc752ec8cac1c0247f30cdaaccc10c3f5889..71c217a4a81181978b54ad10231640ef0501a049 100644 (file)
--- a/modules/misc/httpd.c
+++ b/modules/misc/httpd.c
@@ -2,7 +2,7 @@
  * httpd.c
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.c,v 1.8 2003/03/15 00:09:31 fenrir Exp $
+ * $Id: httpd.c,v 1.9 2003/03/17 23:42:12 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -734,7 +734,7 @@ static httpd_stream_t  *_RegisterStream( httpd_sys_t *p_httpt,
     p_stream->pf_get          = NULL;
     p_stream->pf_post         = NULL;
 
-    p_stream->i_buffer_size   = 1024*1024*10;
+    p_stream->i_buffer_size   = 1024*1024;
     p_stream->i_buffer_pos      = 0;
     p_stream->i_buffer_last_pos = 0;
     p_stream->p_buffer        = malloc( p_stream->i_buffer_size );
@@ -863,7 +863,7 @@ static int             _SendStream( httpd_sys_t *p_httpt, httpd_stream_t *p_stre
     {
         int i_copy;
 
-        i_copy = __MIN( i_data, p_stream->i_buffer_size - i_pos );
+        i_copy = __MIN( i_count, p_stream->i_buffer_size - i_pos );
 
         memcpy( &p_stream->p_buffer[i_pos],
                 p_data,

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 5dd1c15e7fb7a09a15d85448bb08ea285637ecb9..ec92c7d7671837f688ff03524df5f803d3edf2d0 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -2,7 +2,7 @@
  * stream_output.c : stream output module
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: stream_output.c,v 1.21 2003/03/15 19:26:13 fenrir Exp $
+ * $Id: stream_output.c,v 1.22 2003/03/17 23:42:12 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -243,9 +243,13 @@ void sout_DeleteInstance( sout_instance_t * p_sout )
     /* *** remove all muxer *** */
     for( i = 0; i < p_sout->i_nb_mux; i++ )
     {
+        sout_access_out_t *p_access;
 #define p_mux p_sout->pp_mux[i]
+
+        p_access = p_mux->p_access;
+
         MuxDelete( p_mux );
-        sout_AccessOutDelete( p_mux->p_access );
+        sout_AccessOutDelete( p_access );
 #undef  p_mux
     }
     FREE( p_sout->pp_mux );