Merge branch 'master' into next

[paraslash.git] / aacdec.c

diff --git a/aacdec.c b/aacdec.c
index 235b292d33168d74150bb8534f03caa0a365ce64..38f69e8811a79d9e40da8648c38eb4bae35233a2 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -157,9 +157,9 @@ out:
 
 static void aacdec_open(struct filter_node *fn)
 {
-       fn->private_data = para_calloc(sizeof(struct private_aacdec_data));
-       struct private_aacdec_data *padd = fn->private_data;
+       struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
+       fn->private_data = padd;
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
        padd->handle = aac_open();
@@ -183,7 +183,7 @@ static void aacdec_close(struct filter_node *fn)
  *
  * \sa filter::init
  */
-void aacdec_init(struct filter *f)
+void aacdec_filter_init(struct filter *f)
 {
        f->open = aacdec_open;
        f->convert = aacdec;