summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/dec_audio.c
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-01 20:00:04 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-01 20:00:04 +0000
commit6a3e54b5f1dbfc815f7adc723fa82be9c763855f (patch)
tree416206aa968a2eb53710d2f40c6f005898a69fd1 /libmpcodecs/dec_audio.c
parentc4282b3cfed6b73a32ce3c39e130f307c7331fd3 (diff)
downloadmpv-6a3e54b5f1dbfc815f7adc723fa82be9c763855f.tar.bz2
mpv-6a3e54b5f1dbfc815f7adc723fa82be9c763855f.tar.xz
10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12385 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/dec_audio.c')
-rw-r--r--libmpcodecs/dec_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 2f31e1b023..7b65e693c4 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -294,7 +294,7 @@ int preinit_audio_filters(sh_audio_t *sh_audio,
// output format: same as ao driver's input format (if missing, fallback to input)
afs->output.rate = *out_samplerate ? *out_samplerate : afs->input.rate;
afs->output.nch = *out_channels ? *out_channels : afs->input.nch;
- afs->output.format = af_format_decode(*out_format ? *out_format : afs->input.format);
+ afs->output.format = *out_format ? af_format_decode(*out_format) : afs->input.format;
afs->output.bps = out_bps ? out_bps : afs->input.bps;
// filter config: