Make access_out independent of sout instance

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 45856a426a5894f581f3659fd1fa5ac7c57f4a65..3be54cb29e75e3788a9322546ae792407eaafba4 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -100,7 +100,6 @@ struct sout_access_out_t
     int                     (*pf_control)( sout_access_out_t *, int, va_list);
 
     config_chain_t          *p_cfg;
-    sout_instance_t         *p_sout;
 };
 
 enum access_out_query_e

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index ca493b6d9fab09b8a41c7944e860d9cec704d98a..6407aafa9c1237e3a3b8d79850975e8007195e51 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1727,7 +1727,6 @@ static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream )
         return NULL;
 
     p_grab->p_module    = NULL;
-    p_grab->p_sout      = p_stream->p_sout;
     p_grab->psz_access  = strdup( "grab" );
     p_grab->p_cfg       = NULL;
     p_grab->psz_path    = strdup( "" );

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index b52bc97b16b2238640eeb92008ffb892c40f7f41..4d99323a43e5b07617a9f9bb4edb92ba1fabf834 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -307,7 +307,6 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
                                    psz_access );
     free( psz_next );
     p_access->psz_path   = strdup( psz_name ? psz_name : "" );
-    p_access->p_sout     = p_sout;
     p_access->p_sys      = NULL;
     p_access->pf_seek    = NULL;
     p_access->pf_read    = NULL;
@@ -375,6 +374,7 @@ ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
  *****************************************************************************/
 ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
 {
+#if 0
     const unsigned i_packets_gather = 30;
     p_access->i_writes++;
     p_access->i_sent_bytes += p_buffer->i_buffer;
@@ -384,6 +384,7 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
         sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes );
         p_access->i_sent_bytes = 0;
     }
+#endif
     return p_access->pf_write( p_access, p_buffer );
 }