[vlc-commits] commit: sout_InstanceNew: remove __ ( =?UTF-8?Q?R=C3=A9mi=20Denis=2DCourmont=20?=)

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 29 22:52:01 2010 +0200| [177dd4ce9451c482e27e8141f38f34bad4a194fb] | committer: Rémi Denis-Courmont 

sout_InstanceNew: remove __

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=177dd4ce9451c482e27e8141f38f34bad4a194fb
---

 src/stream_output/stream_output.c |    4 +++-
 src/stream_output/stream_output.h |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 38b2361..352262b 100644
--- a/src/stream_output/stream_output.c
+++ b/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;
diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 0952966..b6ed27b 100644
--- a/src/stream_output/stream_output.h
+++ b/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 * );