Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
651e2491
Commit
651e2491
authored
May 02, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use var_AcquireMutex for the quicktime lock.
parent
89d56df6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
include/vlc_main.h
include/vlc_main.h
+0
-3
modules/gui/macosx/voutqt.m
modules/gui/macosx/voutqt.m
+3
-3
src/libvlc-common.c
src/libvlc-common.c
+0
-1
No files found.
include/vlc_main.h
View file @
651e2491
...
...
@@ -76,9 +76,6 @@ struct libvlc_int_t
counter_t
**
pp_timers
;
///< Array of all timers
vlc_mutex_t
config_lock
;
///< Lock for the config file
#ifdef __APPLE__
vlc_mutex_t
quicktime_lock
;
///< QT is not thread safe on OSX
#endif
/* Structure storing the action name / key associations */
struct
hotkey
...
...
modules/gui/macosx/voutqt.m
View file @
651e2491
...
...
@@ -165,8 +165,8 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
/* Damn QT isn't thread safe
.
so keep a
lock in the p_libvlc object
*/
vlc_mutex_
lock
(
&
p_vout
->
p_libvlc
->
quicktime_
lock
);
/* Damn QT isn't thread safe
,
so keep a
process-wide lock
*/
vlc_mutex_
t
*
p_qtlock
=
var_AcquireMutex
(
"
quicktime_
mutex"
);
/* Can we find the right chroma ? */
if
(
p_vout
->
p_sys
->
b_cpu_has_simd
)
...
...
@@ -179,7 +179,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
err
=
FindCodec
(
kYUV420CodecType
,
bestSpeedCodec
,
nil
,
&
p_vout
->
p_sys
->
img_dc
);
}
vlc_mutex_unlock
(
&
p_
vout
->
p_libvlc
->
quicktime_
lock
);
vlc_mutex_unlock
(
p_
qt
lock
);
if
(
err
==
noErr
&&
p_vout
->
p_sys
->
img_dc
!=
0
)
{
...
...
src/libvlc-common.c
View file @
651e2491
...
...
@@ -212,7 +212,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
vlc_mutex_init
(
p_libvlc
,
&
p_libvlc
->
timer_lock
);
vlc_mutex_init
(
p_libvlc
,
&
p_libvlc
->
config_lock
);
#ifdef __APPLE__
vlc_mutex_init
(
p_libvlc
,
&
p_libvlc
->
quicktime_lock
);
vlc_thread_set_priority
(
p_libvlc
,
VLC_THREAD_PRIORITY_LOW
);
#endif
/* Store data for the non-reentrant API */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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