Changeset a8e743f786744cebd251aa15285bd63e458b2696

Show
Ignore:
Timestamp:
16/05/06 20:23:37 (3 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1147803817 +0000
git-parent:

[70905c6d22f7fe86b36442db4255f5f81874f38a]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1147803817 +0000
Message:

* don't fail http output if AVAHI support is enabled, but the avahi daemon is not running. Just generate an error and continue.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access_output/http.c

    r9835f07 ra8e743f  
    114114                CRL_TEXT, CRL_LONGTEXT, VLC_TRUE ); 
    115115    add_bool( SOUT_CFG_PREFIX "bonjour", VLC_FALSE, NULL, 
    116               BONJOUR_TEXT, BONJOUR_LONGTEXT,VLC_TRUE); 
     116              BONJOUR_TEXT, BONJOUR_LONGTEXT, VLC_TRUE); 
    117117    set_callbacks( Open, Close ); 
    118118vlc_module_end(); 
    …… 
    329329        if( p_sys->p_bonjour == NULL ) 
    330330        { 
    331             vlc_object_release( p_playlist ); 
    332             httpd_StreamDelete( p_sys->p_httpd_stream ); 
    333             httpd_HostDelete( p_sys->p_httpd_host ); 
    334             free( (void *)p_sys ); 
    335             return VLC_EGENERIC; 
     331            msg_Err( p_access, "Avahi stream announcing was requested, but no avahi service could be started" ); 
    336332        } 
    337333        vlc_object_release( p_playlist );