Commit c76522a3 authored by Rafaël Carré's avatar Rafaël Carré

sout_AnnounceRegisterSDP(): removes unused SOUT_CFG_PREFIX argument

parent acb0c8e1
...@@ -225,7 +225,7 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo ...@@ -225,7 +225,7 @@ static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_t *id, blo
/**************************************************************************** /****************************************************************************
* Announce handler * 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( int, sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) ); VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) );
......
...@@ -1251,7 +1251,7 @@ static int SapSetup( sout_stream_t *p_stream ) ...@@ -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 ) 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(); 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_sdp,
p_sys->psz_destination, p_sys->psz_destination,
p_method ); p_method );
...@@ -1314,6 +1314,7 @@ static int HttpCallback( httpd_file_sys_t *p_args, ...@@ -1314,6 +1314,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
httpd_file_t *f, uint8_t *p_request, httpd_file_t *f, uint8_t *p_request,
uint8_t **pp_data, int *pi_data ) 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; sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args;
vlc_mutex_lock( &p_sys->lock_sdp ); vlc_mutex_lock( &p_sys->lock_sdp );
......
...@@ -384,8 +384,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -384,8 +384,7 @@ static int Open( vlc_object_t *p_this )
msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp);
p_sys->p_session = p_sys->p_session =
sout_AnnounceRegisterSDP (p_sout, SOUT_CFG_PREFIX, psz_sdp, sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
dhost, p_method);
sout_MethodRelease (p_method); sout_MethodRelease (p_method);
} }
free (dhost); free (dhost);
......
...@@ -60,9 +60,8 @@ struct announce_method_t ...@@ -60,9 +60,8 @@ struct announce_method_t
* \return the new session descriptor structure * \return the new session descriptor structure
*/ */
session_descriptor_t * session_descriptor_t *
sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *cfgpref, sout_AnnounceRegisterSDP( sout_instance_t *p_sout, const char *psz_sdp,
const char *psz_sdp, const char *psz_dst, const char *psz_dst, announce_method_t *p_method )
announce_method_t *p_method )
{ {
session_descriptor_t *p_session; session_descriptor_t *p_session;
announce_handler_t *p_announce = (announce_handler_t*) announce_handler_t *p_announce = (announce_handler_t*)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment