Commit 959745b1 authored by Gildas Bazin's avatar Gildas Bazin

* Merged trunk changes r9187:9188 to 0.8.1 branch.

parent 728d404a
...@@ -471,7 +471,7 @@ Open( vlc_object_t *p_this ) ...@@ -471,7 +471,7 @@ Open( vlc_object_t *p_this )
if( count.i_int == 0) 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); gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
if( gnutls_global_init( ) ) if( gnutls_global_init( ) )
......
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