sout_AnnounceRegisterSDP(): removes unused SOUT_CFG_PREFIX argument

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 2f55b6a7e93e51ca9f917190453268ef1dc2899c..7befad4f8b7e74cd68afd8df8b22ecf39182289f 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -225,7 +225,7 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
 /****************************************************************************
  * Announce handler
  ****************************************************************************/
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *, const char *, const char *, const char *, announce_method_t* ) );
+VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( sout_instance_t *, const char *, const char *, announce_method_t* ) );
 VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
 
 VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 28439eee2eacde16fb75874175524870a15d32d4..785149835ee07820913123c9d513ff5b171d7d75 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1251,7 +1251,7 @@ static int SapSetup( sout_stream_t *p_stream )
     if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
     {
         announce_method_t *p_method = sout_SAPMethod();
-        p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
+        p_sys->p_session = sout_AnnounceRegisterSDP( p_sout,
                                                      p_sys->psz_sdp,
                                                      p_sys->psz_destination,
                                                      p_method );
@@ -1314,6 +1314,7 @@ static int  HttpCallback( httpd_file_sys_t *p_args,
                           httpd_file_t *f, uint8_t *p_request,
                           uint8_t **pp_data, int *pi_data )
 {
+    VLC_UNUSED(f); VLC_UNUSED(p_request);
     sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args;
 
     vlc_mutex_lock( &p_sys->lock_sdp );

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index d7288e724782507bdbbef9f0d84be73e34245121..edc04f509f841cd57be882774fe3a6b4d9eb89b6 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -384,8 +384,7 @@ static int Open( vlc_object_t *p_this )
             msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp);
 
             p_sys->p_session =
-                sout_AnnounceRegisterSDP (p_sout, SOUT_CFG_PREFIX, psz_sdp,
-                                          dhost, p_method);
+                sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
             sout_MethodRelease (p_method);
         }
         free (dhost);

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index 0215eec7dacb92703483de1352ca29d3a0587095..4c183cce54b7f05d82e43b8f9fcdf36f2d5831a5 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -60,9 +60,8 @@ struct announce_method_t
  * \return the new session descriptor structure
  */
 session_descriptor_t *
-sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref,
-                          const char *psz_sdp, const char *psz_dst,
-                          announce_method_t *p_method )
+sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *psz_sdp,
+                            const char *psz_dst, announce_method_t *p_method )
 {
     session_descriptor_t *p_session;
     announce_handler_t *p_announce = (announce_handler_t*)