path: root/audio/out/ao_openal.c
diff options
authorwm4 <wm4@nowhere>2014-09-06 00:16:15 +0200
committerwm4 <wm4@nowhere>2014-09-06 00:16:15 +0200
commit197f18402ed1e38e8e151a912e416e0b86d277d2 (patch)
tree033fd17f6e10a696fec71c1137d343f145206f9b /audio/out/ao_openal.c
parentbdf49d137e5fc63f22ddbb54f4d585719cdd2e5d (diff)
sub: fix possible deadlock with --no-sub-ass and similar
This is a deadlock caused by a lock order issue: sub/osd.c locks the OSD first, then the subtitle decoder lock. player/sub.c does the reverse. Fix this by discussing away the requirement for locking (see below), which allows us to drop the broken sub lock. sub_get_text() still acquires and releases the sub decoder lock, but it's not held at the same time as the OSD lock anymore, so it should be fine. Originally, the sub lock was acquired because sub_get_text() returns a pointer to a mutable string. We simply declare that it's ok to call it unlocked, as long as only 1 thread accesses it, which works out fine in this case.
Diffstat (limited to 'audio/out/ao_openal.c')
0 files changed, 0 insertions, 0 deletions