diff options
| author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
| commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
| tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/mixer.c | |
| parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
| parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
| download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz | |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/mixer.c')
| -rw-r--r-- | audio/mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/mixer.c b/audio/mixer.c index b67e548a3c..0f1a7871d6 100644 --- a/audio/mixer.c +++ b/audio/mixer.c @@ -217,7 +217,7 @@ void mixer_setbalance(mixer_t *mixer, float val) AF_CONTROL_PAN_BALANCE | AF_CONTROL_SET, &val)) return; - if (val == 0 || mixer->ao->channels < 2) + if (val == 0 || mixer->ao->channels.num < 2) return; if (!(af_pan_balance = af_add(mixer->afilter, "pan"))) { |