sout_InstanceNew: remove __

src/stream_output/stream_output.c

@@ -75,10 +75,12 @@ static int  mrl_Parse( mrl_t *p_mrl, const char *psz_mrl );
 /* mrl_Clean: clean p_mrl  after a call to mrl_Parse */
 static void mrl_Clean( mrl_t *p_mrl );
 
+#undef sout_NewInstance
+
 /*****************************************************************************
  * sout_NewInstance: creates a new stream output instance
  *****************************************************************************/
-sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
+sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
 {
     static const char typename[] = "stream output";
     sout_instance_t *p_sout;

src/stream_output/stream_output.h

@@ -42,8 +42,8 @@ struct sout_packetizer_input_t
     sout_stream_id_t    *id;
 };
 
-#define sout_NewInstance(a,b) __sout_NewInstance(VLC_OBJECT(a),b)
-sout_instance_t *  __sout_NewInstance( vlc_object_t *, const char * );
+sout_instance_t *sout_NewInstance( vlc_object_t *, const char * );
+#define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b)
 void sout_DeleteInstance( sout_instance_t * );
 
 sout_packetizer_input_t *sout_InputNew( sout_instance_t *, es_format_t * );