[vlc-commits] upnp: do not pass the upnp instance as user data

Shaleen Jain git at videolan.org
Sun Oct 28 11:26:22 CET 2018


vlc | branch: master | Shaleen Jain <shaleen at jain.sh> | Tue Oct 23 12:39:19 2018 +0530| [d49fa572b204c76d04c9b2d86a33933548767260] | committer: Jean-Baptiste Kempf

upnp: do not pass the upnp instance as user data

UPNP SDK functions cannot be called from the registered
callback so there is no point in passing an instance of
upnp instance to the callback as a user data.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/services_discovery/upnp-wrapper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services_discovery/upnp-wrapper.cpp b/modules/services_discovery/upnp-wrapper.cpp
index 6ff748c8b4..3e924274dc 100644
--- a/modules/services_discovery/upnp-wrapper.cpp
+++ b/modules/services_discovery/upnp-wrapper.cpp
@@ -85,7 +85,7 @@ UpnpInstanceWrapper *UpnpInstanceWrapper::get(vlc_object_t *p_obj)
         ixmlRelaxParser( 1 );
 
         /* Register a control point */
-        i_res = UpnpRegisterClient( Callback, instance, &instance->m_handle );
+        i_res = UpnpRegisterClient( Callback, NULL, &instance->m_handle );
         if( i_res != UPNP_E_SUCCESS )
         {
             msg_Err( p_obj, "Client registration failed: %s", UpnpGetErrorMessage( i_res ) );



More information about the vlc-commits mailing list