From f8a98fc133db0d12db4688704596a679ded0ec2f Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Apr 2015 18:04:04 +0200 Subject: af_lavrresample: allow resetting output sample format It must be allowed to set format==0. --- audio/filter/af_lavrresample.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'audio/filter/af_lavrresample.c') diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 9e4a8adaaa..679e9f9e8d 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -298,10 +298,11 @@ static int control(struct af_instance *af, int cmd, void *arg) return r; } case AF_CONTROL_SET_FORMAT: { - if (af_to_avformat(*(int*)arg) == AV_SAMPLE_FMT_NONE) + int format = *(int *)arg; + if (format && af_to_avformat(format) == AV_SAMPLE_FMT_NONE) return AF_FALSE; - mp_audio_set_format(af->data, *(int*)arg); + mp_audio_set_format(af->data, format); return AF_OK; } case AF_CONTROL_SET_CHANNELS: { -- cgit v1.2.3