Revert "Prefer setenv to putenv (evenmore with local variables)."

[vlc] / modules / codec / dmo / buffer.c

diff --git a/modules/codec/dmo/buffer.c b/modules/codec/dmo/buffer.c
index 8e0721fddc8040b96dd9e9f6cf79b47995dc38dd..321709df219adb552a9ec4c0ce392b698c022a55 100644 (file)
--- a/modules/codec/dmo/buffer.c
+++ b/modules/codec/dmo/buffer.c
@@ -25,7 +25,11 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 
@@ -104,13 +108,13 @@ static long STDCALL GetBufferAndLength( IMediaBuffer *This,
     CMediaBuffer *p_mb = (CMediaBuffer *)This;
 
     if( !ppBuffer && !pcbLength ) return E_POINTER;
-    if( ppBuffer ) *ppBuffer = p_mb->p_block->p_buffer;
+    if( ppBuffer ) *ppBuffer = (char*)p_mb->p_block->p_buffer;
     if( pcbLength ) *pcbLength = p_mb->p_block->i_buffer;
     return S_OK;
 }
 
 CMediaBuffer *CMediaBufferCreate( block_t *p_block, int i_max_size,
-                                  vlc_bool_t b_own )
+                                  bool b_own )
 {
     CMediaBuffer *p_mb = (CMediaBuffer *)malloc( sizeof(CMediaBuffer) );
     if( !p_mb ) return NULL;