From fc24ab9298ff155ad94171c1b8f16f4da422376c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 21 Mar 2013 00:58:05 +0100
Subject: audio/filter: replace pointless memcpys with assignments

The change in af_scaletempo actually fixes a memory leak. af->data
contained a pointer to an allocated buffer, which was overwritten
during format negotiation. Set the format explicitly instead.
---
 audio/filter/af_scaletempo.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'audio/filter/af_scaletempo.c')

diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c
index cf326fedfb..657fd7f712 100644
--- a/audio/filter/af_scaletempo.c
+++ b/audio/filter/af_scaletempo.c
@@ -305,7 +305,10 @@ static int control(struct af_instance* af, int cmd, void* arg)
     if (s->scale == 1.0) {
       if (s->speed_tempo && s->speed_pitch)
         return AF_DETACH;
-      memcpy(af->data, data, sizeof(struct mp_audio));
+      af->data->format = data->format;
+      af->data->nch    = data->nch;
+      af->data->rate   = data->rate;
+      af->data->bps    = data->bps;
       af->delay = 0;
       af->mul = 1;
       return af_test_output(af, data);
-- 
cgit v1.2.3