X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fsap.c;h=631c16dd0850cd4f5e1c51b44dee542e9b785232;hb=bd669141be882a62b33c08d7aa97501e0b5faff2;hp=88882151f2a5d2cbabcb846941ac3fbaedb33748;hpb=125acdef1ed11c0684ccf57110d4f8741a4e705c;p=vlc diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index 88882151f2..631c16dd08 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -30,6 +30,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include @@ -603,7 +604,7 @@ static void *Run( void *data ) else if( timeout < 200 ) timeout = 200; /* Don't wakeup too fast. */ } - assert (0); + vlc_assert_unreachable (); } /********************************************************************** @@ -642,7 +643,7 @@ static int Demux( demux_t *p_demux ) vlc_mutex_lock( &p_parent_input->lock ); - p_parent_input->i_type = ITEM_TYPE_NET; + p_parent_input->i_type = ITEM_TYPE_STREAM; vlc_mutex_unlock( &p_parent_input->lock ); vlc_object_release( p_input ); @@ -855,7 +856,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint32_t *i_source, /* Released in RemoveAnnounce */ p_input = input_item_NewWithType( p_sap->p_sdp->psz_uri, p_sdp->psz_sessionname, - 0, NULL, 0, -1, ITEM_TYPE_NET ); + 0, NULL, 0, -1, ITEM_TYPE_STREAM ); if( unlikely(p_input == NULL) ) { free( p_sap );