diff options
| author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
| commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
| tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/filter/af_sweep.c | |
| parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
| parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
| download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz | |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/filter/af_sweep.c')
| -rw-r--r-- | audio/filter/af_sweep.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/audio/filter/af_sweep.c b/audio/filter/af_sweep.c index 6d1106fefc..6cc099f2d8 100644 --- a/audio/filter/af_sweep.c +++ b/audio/filter/af_sweep.c @@ -41,12 +41,10 @@ static int control(struct af_instance* af, int cmd, void* arg) switch(cmd){ case AF_CONTROL_REINIT: - af->data->nch = data->nch; - af->data->format = AF_FORMAT_S16_NE; - af->data->bps = 2; - af->data->rate = data->rate; + mp_audio_copy_config(af->data, data); + mp_audio_set_format(af->data, AF_FORMAT_S16_NE); - return AF_OK; + return af_test_output(af, data); case AF_CONTROL_COMMAND_LINE: sscanf((char*)arg,"%lf", &s->delta); return AF_OK; |