Merge branch 'audio_changes'

Conflicts:
	audio/out/ao_lavc.c

1 files changed, 2 insertions, 3 deletions

diff --git a/audio/filter/af_sub.c b/audio/filter/af_sub.c
index 4af28d9141..a985ac2a05 100644
--- a/audio/filter/af_sub.c
+++ b/audio/filter/af_sub.c
@@ -70,9 +70,8 @@ static int control(struct af_instance* af, int cmd, void* arg)
     if(!arg) return AF_ERROR;
 
     af->data->rate   = ((struct mp_audio*)arg)->rate;
-    af->data->nch    = max(s->ch+1,((struct mp_audio*)arg)->nch);
-    af->data->format = AF_FORMAT_FLOAT_NE;
-    af->data->bps    = 4;
+    mp_audio_set_channels_old(af->data, max(s->ch+1,((struct mp_audio*)arg)->nch));
+    mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE);
 
     // Design low-pass filter
     s->k = 1.0;