Merge branch 1.0-bugfix (early part) into master

[vlc] / modules / misc / dummy / encoder.c

diff --git a/modules/misc/dummy/encoder.c b/modules/misc/dummy/encoder.c
index fc93fd11360bda0ade0e8fab99515103bfcd39ef..ed8fee0c78d36e00dab59e69c2a9c1ffeec2f935 100644 (file)
--- a/modules/misc/dummy/encoder.c
+++ b/modules/misc/dummy/encoder.c
@@ -24,7 +24,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include "dummy.h"
 
@@ -37,7 +41,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_buf );
 /*****************************************************************************
  * OpenDecoder: open the dummy encoder.
  *****************************************************************************/
-int E_(OpenEncoder) ( vlc_object_t *p_this )
+int OpenEncoder ( vlc_object_t *p_this )
 {
     encoder_t *p_enc = (encoder_t *)p_this;
 
@@ -52,6 +56,7 @@ int E_(OpenEncoder) ( vlc_object_t *p_this )
  ****************************************************************************/
 static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
 {
+    VLC_UNUSED(p_enc); VLC_UNUSED(p_pict);
     return NULL;
 }
 
@@ -60,12 +65,14 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
  ****************************************************************************/
 static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_buf )
 {
+    VLC_UNUSED(p_enc); VLC_UNUSED(p_buf);
     return NULL;
 }
 
 /*****************************************************************************
  * CloseDecoder: decoder destruction
  *****************************************************************************/
-void E_(CloseEncoder) ( vlc_object_t *p_this )
+void CloseEncoder ( vlc_object_t *p_this )
 {
+    VLC_UNUSED(p_this);
 }