summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_alsa.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-16 18:47:02 +0200
committerwm4 <wm4@nowhere>2013-06-16 19:32:18 +0200
commitf88193091b3de59b496633682b659cd388e24a59 (patch)
tree2dd817c703d169716c17a45d172e8f36353621ac /audio/out/ao_alsa.c
parentc8c70dce5719576648489f9d2bad1cf9b61495a1 (diff)
downloadmpv-f88193091b3de59b496633682b659cd388e24a59.tar.bz2
mpv-f88193091b3de59b496633682b659cd388e24a59.tar.xz
audio/out: don't require AOs to set ao->bps
Some still do, because they use the value in other places of the init function. ao_portaudio is tricky and reads ao->bps in the stream thread, which might be started on initialization (not sure about that, but better safe than sorry).
Diffstat (limited to 'audio/out/ao_alsa.c')
-rw-r--r--audio/out/ao_alsa.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index a8952e4547..6dd04d2967 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -560,7 +560,6 @@ static int init(struct ao *ao, char *params)
p->bytes_per_sample = af_fmt2bits(ao->format) / 8;
p->bytes_per_sample *= ao->channels.num;
- ao->bps = ao->samplerate * p->bytes_per_sample;
err = snd_pcm_hw_params_set_buffer_time_near
(p->alsa, alsa_hwparams, &(unsigned int){BUFFER_TIME}, NULL);