X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=bbb756a9aa813faf22c952d18e2be739c4590a88;hp=9791175ecd72d6dcd22ee719f90d1e59481668b3;hb=e413873ec15efc84366e747d3c5d48293b959c1f;hpb=a80869e84654120689bd63b4a0f944bd1124332e

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 9791175e..bbb756a9 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -15,7 +15,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -127,7 +126,7 @@ next_buffer:
 		}
 		padd->sample_rate = rate;
 		padd->channels = channels;
-		PARA_INFO_LOG("rate: %u, channels: %d\n",
+		PARA_INFO_LOG("rate: %u, channels: %u\n",
 			padd->sample_rate, padd->channels);
 		padd->initialized = 1;
 	}
@@ -171,7 +170,7 @@ next_buffer:
 			goto success;
 		}
 		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(err));
-		PARA_ERROR_LOG("consumed: %zu + %zd + %lu\n",
+		PARA_ERROR_LOG("consumed: %zu + %zu + %lu\n",
 			padd->consumed_total, consumed,
 			padd->frame_info.bytesconsumed);
 		if (consumed < len)
@@ -206,18 +205,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
+};