summaryrefslogtreecommitdiffstats
path: root/mp_core.h
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-01-18 04:21:58 +0100
committerwm4 <wm4@mplayer2.org>2012-01-18 04:21:58 +0100
commit6e41497d5be1f107c18b2143fa45b3c46d6e95d3 (patch)
treeba18bcab5e209d3c48658bac046fa48a9c5f053a /mp_core.h
parent064f8c2fb656462db9662c67bdbc6716958a4de4 (diff)
parentf7c2ecebccc4b3c5d6299aee5b8f4d382fa78987 (diff)
downloadmpv-6e41497d5be1f107c18b2143fa45b3c46d6e95d3.tar.bz2
mpv-6e41497d5be1f107c18b2143fa45b3c46d6e95d3.tar.xz
Merge branch 'softvol' into my_master
Diffstat (limited to 'mp_core.h')
-rw-r--r--mp_core.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/mp_core.h b/mp_core.h
index e46d3d77d2..7df1a3ba1d 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -187,9 +187,6 @@ typedef struct MPContext {
double last_chapter_pts;
float begin_skip; ///< start time of the current skip while on edlout mode
- // audio is muted if either EDL or user activates mute
- short edl_muted; ///< Stores whether EDL is currently in muted mode.
- short user_muted; ///< Stores whether user wanted muted mode.
int global_sub_size; // this encompasses all subtitle sources
int global_sub_pos; // this encompasses all subtitle sources