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_delay.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_delay.c')
| -rw-r--r-- | audio/filter/af_delay.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/filter/af_delay.c b/audio/filter/af_delay.c index ce8d71980b..eb3e9e19cb 100644 --- a/audio/filter/af_delay.c +++ b/audio/filter/af_delay.c @@ -52,10 +52,7 @@ static int control(struct af_instance* af, int cmd, void* arg) for(i=0;i<af->data->nch;i++) free(s->q[i]); - af->data->rate = ((struct mp_audio*)arg)->rate; - af->data->nch = ((struct mp_audio*)arg)->nch; - af->data->format = ((struct mp_audio*)arg)->format; - af->data->bps = ((struct mp_audio*)arg)->bps; + mp_audio_copy_config(af->data, (struct mp_audio*)arg); // Allocate new delay queues for(i=0;i<af->data->nch;i++){ |