Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
43dbc005
Commit
43dbc005
authored
Jan 22, 2008
by
Rémi Denis-Courmont
Browse files
Remove the static gnutls object pointer thanks to previous commit
parent
10a38049
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/misc/gnutls.c
View file @
43dbc005
...
...
@@ -107,9 +107,6 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
* gcrypt thread option VLC implementation
*/
# define NEED_THREAD_CONTEXT 1
static
vlc_object_t
*
__p_gcry_data
=
NULL
;
static
int
gcry_vlc_mutex_init
(
void
**
p_sys
)
{
int
i_val
;
...
...
@@ -118,7 +115,7 @@ static int gcry_vlc_mutex_init( void **p_sys )
if
(
p_lock
==
NULL
)
return
ENOMEM
;
i_val
=
vlc_mutex_init
(
__p_gcry_data
,
p_lock
);
i_val
=
vlc_mutex_init
(
NULL
,
p_lock
);
if
(
i_val
)
free
(
p_lock
);
else
...
...
@@ -168,12 +165,6 @@ static int gnutls_Init (vlc_object_t *p_this)
vlc_mutex_t
*
lock
=
var_AcquireMutex
(
"gnutls_mutex"
);
/* This should probably be removed/fixed. It will screw up with multiple
* LibVLC instances. */
#ifdef NEED_THREAD_CONTEXT
__p_gcry_data
=
VLC_OBJECT
(
p_this
->
p_libvlc
);
#endif
gcry_control
(
GCRYCTL_SET_THREAD_CBS
,
&
gcry_threads_vlc
);
if
(
gnutls_global_init
())
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment