Merge branch 'refs/heads/t/wma'

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index e1cf802cb0e4c807e8684957424c7237eee787e4..ce3eb3bd93dc315afc91a01737a3a1a2195e1b36 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -17,7 +17,6 @@
 #include "portable_io.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -29,7 +28,7 @@
 /**
  * data specific to the aacdec filter
  *
- * \sa filter, filter_node
+ * \sa \ref filter, \ref filter_node.
  */
 struct private_aacdec_data {
        /** the return value of aac_open */
@@ -160,18 +159,10 @@ err:
        return ret;
 }
 
-/**
- * The init function of the aacdec filter.
- *
- * \param f Pointer to the filter struct to initialize.
- *
- * \sa filter::init
- */
-void aacdec_filter_init(struct filter *f)
-{
-       f->open = aacdec_open;
-       f->close = aacdec_close;
-       f->pre_select = generic_filter_pre_select;
-       f->post_select = aacdec_post_select;
-       f->execute = aacdec_execute;
-}
+const struct filter lsg_filter_cmd_com_aacdec_user_data = {
+       .open = aacdec_open,
+       .close = aacdec_close,
+       .pre_select = generic_filter_pre_select,
+       .post_select = aacdec_post_select,
+       .execute = aacdec_execute
+};