Merge branch 'master' into next

[paraslash.git] / mp3dec.c

diff --git a/mp3dec.c b/mp3dec.c
index 615a06400a58f34408ffef12a7b0be436b51a026..599d8a90928d6fdeb9c2d2cd418df707c3620fb3 100644 (file)
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -108,9 +108,9 @@ static void mp3dec_close(struct filter_node *fn)
 
 static void mp3dec_open(struct filter_node *fn)
 {
-       fn->private_data = para_calloc(sizeof(struct private_mp3dec_data));
-       struct private_mp3dec_data *pmd = fn->private_data;
+       struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));
 
+       fn->private_data = pmd;
        mad_stream_init(&pmd->stream);
        mad_frame_init(&pmd->frame);
        mad_synth_init(&pmd->synth);
@@ -126,7 +126,7 @@ static void mp3dec_open(struct filter_node *fn)
  *
  * \sa filter::init.
  */
-void mp3dec_init(struct filter *f)
+void mp3dec_filter_init(struct filter *f)
 {
        f->open = mp3dec_open;
        f->convert = mp3dec;