Commit fa06cb36 authored by Gildas Bazin's avatar Gildas Bazin

* modules/control/http.c: on win32 we store the html interface in "http" not "share/http".
* src/input/input_programs.c: check for "" descriptions in AddES().
parent 673e5d9e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c : http mini-server ;) * http.c : http mini-server ;)
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: http.c,v 1.18 2003/07/29 18:51:16 fenrir Exp $ * $Id: http.c,v 1.19 2003/07/30 21:09:06 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr> * Laurent Aimar <fenrir@via.ecp.fr>
...@@ -234,7 +234,11 @@ static int Activate( vlc_object_t *p_this ) ...@@ -234,7 +234,11 @@ static int Activate( vlc_object_t *p_this )
{ {
char * psz_vlcpath = p_intf->p_libvlc->psz_vlcpath; char * psz_vlcpath = p_intf->p_libvlc->psz_vlcpath;
psz_src = malloc( strlen(psz_vlcpath) + strlen("/share/http" ) + 1 ); psz_src = malloc( strlen(psz_vlcpath) + strlen("/share/http" ) + 1 );
#if defined(WIN32)
sprintf( psz_src, "%s/http", psz_vlcpath);
#else
sprintf( psz_src, "%s/share/http", psz_vlcpath); sprintf( psz_src, "%s/share/http", psz_vlcpath);
#endif
} }
#else #else
psz_src = config_GetPsz( p_intf, "http-src" ); psz_src = config_GetPsz( p_intf, "http-src" );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2002 VideoLAN * Copyright (C) 1999-2002 VideoLAN
* $Id: input_programs.c,v 1.115 2003/07/23 22:01:25 gbazin Exp $ * $Id: input_programs.c,v 1.116 2003/07/30 21:09:06 gbazin Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -676,7 +676,7 @@ es_descriptor_t * input_AddES( input_thread_t * p_input, ...@@ -676,7 +676,7 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
} }
/* Take care of the ES description */ /* Take care of the ES description */
if( psz_desc ) if( psz_desc && *psz_desc )
{ {
p_es->psz_desc = strdup( psz_desc ); p_es->psz_desc = strdup( psz_desc );
} }
......
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