hummmmmm ... breaking opengl build on windows isn't a good idea

[vlc] / include / stream_output.h

diff --git a/include/stream_output.h b/include/stream_output.h
index 488ce86b459a25400775b2c73fdd31cb76d8f2ac..6ef318581ceae67f5b9bfe339d50118fa2915a12 100644 (file)
--- a/include/stream_output.h
+++ b/include/stream_output.h
@@ -260,8 +260,8 @@ struct announce_method_t
 
     /* For SAP */
     int i_ip_version;
-    char *psz_ipv6_scope;
     char *psz_address; /* If we use a custom address */
+    char sz_ipv6_scope;
 };
 
 
@@ -322,6 +322,9 @@ struct sap_handler_t
 
     int (*pf_add)  ( sap_handler_t*, session_descriptor_t *,announce_method_t*);
     int (*pf_del)  ( sap_handler_t*, session_descriptor_t *);
+
+    /* private data, not in p_sys as there is one kind of sap_handler_t */
+    vlc_iconv_t iconvHandle;
 };
 
 /* The main announce handler object */
@@ -365,7 +368,7 @@ VLC_EXPORT( int,                sout_AnnounceRegister, (sout_instance_t *,sessio
 VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *,char *, announce_method_t* ) );
 VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
 
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, () );
+VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (void) );
 VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
 VLC_EXPORT(announce_method_t*,   sout_AnnounceMethodCreate, (int) );