[vlc-commits] httpd: don't inherit from libvlc object

Pierre Ynard git at videolan.org
Tue Oct 4 04:20:02 CEST 2011


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Tue Oct  4 03:24:05 2011 +0200| [751dc388e4457e5ad991d0286a4be35f3da12e10] | committer: Pierre Ynard

httpd: don't inherit from libvlc object

This will allow normal variable inheritance

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=751dc388e4457e5ad991d0286a4be35f3da12e10
---

 src/network/httpd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/httpd.c b/src/network/httpd.c
index b92139b..8e64b26 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -1068,8 +1068,8 @@ static httpd_host_t *httpd_HostCreate( vlc_object_t *p_this,
     vlc_cond_init( &host->wait );
     host->i_ref = 1;
 
-    char *hostname = var_InheritString( p_this->p_libvlc, hostvar );
-    unsigned port = var_InheritInteger( p_this->p_libvlc, portvar );
+    char *hostname = var_InheritString( p_this, hostvar );
+    unsigned port = var_InheritInteger( p_this, portvar );
     host->fds = net_ListenTCP( p_this, hostname, port );
     free( hostname );
     if( host->fds == NULL )



More information about the vlc-commits mailing list