summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-12 16:51:53 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:34 +0200
commitce1f5e78c2b10e24c78d7ee65d7196093709b8ce (patch)
tree101b19e7372368e4f900234262a55d71380835c2 /player/core.h
parent7f91e2684e8600c45512e36f03aadff0b825a1b0 (diff)
downloadmpv-ce1f5e78c2b10e24c78d7ee65d7196093709b8ce.tar.bz2
mpv-ce1f5e78c2b10e24c78d7ee65d7196093709b8ce.tar.xz
player: rename "lock" to "abort_lock"
If a struct as large as MPContext contains a field named "lock", it creates the impression that it is the primary lock for MPContext. This is wrong, the lock just protects a single field.
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/core.h b/player/core.h
index 9a9eb81852..0434c5cb64 100644
--- a/player/core.h
+++ b/player/core.h
@@ -438,9 +438,9 @@ typedef struct MPContext {
struct mp_ipc_ctx *ipc_ctx;
- pthread_mutex_t lock;
+ pthread_mutex_t abort_lock;
- // --- The following fields are protected by lock
+ // --- The following fields are protected by abort_lock
struct mp_cancel *demuxer_cancel; // cancel handle for MPContext.demuxer
// --- Owned by MPContext