summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-04-28 00:39:19 +0200
committerwm4 <wm4@mplayer2.org>2012-04-28 00:54:26 +0200
commit87f4cafe9c0881743d1117c2e8cd7e3376e33302 (patch)
treef41caa5aad8969d769a777c0a7912751721a66bd /mplayer.c
parent1324eaece08d84fbe3eb539642dba99b74dd1c07 (diff)
parentb711624ef350d1e971f5fcc57eb4af9f74233d2a (diff)
downloadmpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.bz2
mpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.xz
Merge remote-tracking branch 'origin/master'
Conflicts: command.c libao2/ao_alsa.c libao2/ao_dsound.c libao2/ao_pulse.c libao2/audio_out.h mixer.c mixer.h mplayer.c Replace my mixer changes with uau's implementation, which is based on my code.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 1826cd485e..ce617eccff 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1827,11 +1827,10 @@ void reinit_audio_chain(struct MPContext *mpctx)
"Couldn't find matching filter/ao format!\n");
goto init_error;
}
- mpctx->mixer.ao = ao;
mpctx->mixer.volstep = volstep;
mpctx->mixer.softvol = opts->softvol;
mpctx->mixer.softvol_max = opts->softvol_max;
- mixer_reinit(&mpctx->mixer);
+ mixer_reinit(&mpctx->mixer, ao);
mpctx->syncing_audio = true;
return;