* Merged trunk changes r9187:9188 to 0.8.1 branch.

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 670f4e07ff8798838333ce32850a5a4c7c343529..5b2a4e2cd267d1d16235add72b80549a08c4bc5f 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -471,7 +471,7 @@ Open( vlc_object_t *p_this )
 
     if( count.i_int == 0)
     {
-        __p_gcry_data = p_this;
+        __p_gcry_data = VLC_OBJECT( p_this->p_vlc );
 
         gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
         if( gnutls_global_init( ) )