Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / src / misc / image.c

diff --git a/src/misc/image.c b/src/misc/image.c
index 497d073a183a763264f508301ceec93f668638c9..7a6457262034a739d6b97920491416bc96e2f5a2 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -43,9 +43,10 @@
 #include <vlc_es.h>
 #include <vlc_image.h>
 #include <vlc_stream.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
 #include <vlc_sout.h>
 #include <libvlc.h>
+#include <vlc_modules.h>
 
 static picture_t *ImageRead( image_handler_t *, block_t *,
                              video_format_t *, video_format_t * );
@@ -74,11 +75,12 @@ vlc_fourcc_t image_Type2Fourcc( const char * );
 vlc_fourcc_t image_Ext2Fourcc( const char * );
 /*static const char *Fourcc2Ext( vlc_fourcc_t );*/
 
+#undef image_HandlerCreate
 /**
  * Create an image_handler_t instance
  *
  */
-image_handler_t *__image_HandlerCreate( vlc_object_t *p_this )
+image_handler_t *image_HandlerCreate( vlc_object_t *p_this )
 {
     image_handler_t *p_image = calloc( 1, sizeof(image_handler_t) );
     if( !p_image )
@@ -376,7 +378,7 @@ static int ImageWriteUrl( image_handler_t *p_image, picture_t *p_pic,
         p_fmt_out->i_chroma = image_Ext2Fourcc( psz_url );
     }
 
-    file = utf8_fopen( psz_url, "wb" );
+    file = vlc_fopen( psz_url, "wb" );
     if( !file )
     {
         msg_Err( p_image->p_parent, "%s: %m", psz_url );