Revert [23694] because the fix was bad.

[vlc] / modules / stream_out / dummy.c

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index 12a4b096095eefb1e8ab1497cf373e6c76ee276a..b86c709e3e42e06f397811bef268c9297189a6f8 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -24,11 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_block.h>
+#include <vlc_sout.h>
 
 /*****************************************************************************
  * Exported prototypes
@@ -71,24 +70,12 @@ static int Open( vlc_object_t *p_this )
  *****************************************************************************/
 static void Close( vlc_object_t * p_this )
 {
-#if 0
-    sout_stream_t   *p_stream = (sout_stream_t*)p_this;
-#endif
+    (void)p_this;
 }
 
-struct sout_stream_id_t
-{
-    int i_d_u_m_m_y;
-};
-
 static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
-    sout_stream_id_t *id;
-
-    id = malloc( sizeof( sout_stream_id_t ) );
-    id->i_d_u_m_m_y = 0;
-
-    return id;
+    return malloc( 0 );
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
@@ -101,6 +88,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
                  block_t *p_buffer )
 {
+    (void)p_stream; (void)id;
     block_ChainRelease( p_buffer );
     return VLC_SUCCESS;
 }