Revert commit [12925] - reopens #403

psz_uri is NEEDED - it determines the destination for SAP announces
Go read the code before you commit

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index b1efda9d9306e0c09dc62729490d0b4ea18432cc..688cb3ce59191920bdb3f8e94d1071ab2e3ef85c 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -244,10 +244,11 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
 
     vlc_mutex_lock( &p_sap->object_lock );
 
-    if( p_session->psz_uri == NULL && p_session->psz_sdp == NULL )
+    if( p_session->psz_uri == NULL )
     {
         vlc_mutex_unlock( &p_sap->object_lock );
-        msg_Err( p_sap, "Trying to create a NULL SAP announce" );
+        msg_Err( p_sap, "*FIXME* Unexpected NULL URI for SAP announce" );
+        msg_Err( p_sap, "This should not happen. VLC needs fixing." );
         return VLC_EGENERIC;
     }
 
@@ -323,7 +324,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
             ((struct sockaddr_in *)&addr)->sin_addr.s_addr = htonl( ipv4 );
             break;
         }
-        
+
         default:
             vlc_mutex_unlock( &p_sap->object_lock );
             vlc_freeaddrinfo( res );