X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=7f2a22a223ce733aa4b49d0a60ff63d1b95bf321;hp=f70b811c4e2fedd39c1bb53d9d77e98dbbdd23aa;hb=a1610c2bd6e3097c6473c5403bfd59425b2058ba;hpb=16b889fa03e8e9e97ed89370ad40fea4ee9b3e3a

diff --git a/aac_afh.c b/aac_afh.c
index f70b811c..7f2a22a2 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG
@@ -11,6 +7,7 @@
 /** \file aac_afh.c para_server's aac audio format handler. */
 
 #include <regex.h>
+#include <neaacdec.h>
 
 #include "para.h"
 
@@ -22,7 +19,6 @@
 #include "portable_io.h"
 #include "afh.h"
 #include "string.h"
-#include "aac.h"
 #include "fd.h"
 
 
@@ -337,17 +333,17 @@ close:
 }
 
 static const char * const aac_suffixes[] = {"m4a", "mp4", NULL};
+
 /**
- * the init function of the aac audio format handler
+ * The audio format handler for the Advanced Audio Codec.
  *
- * \param afh pointer to the struct to initialize
+ * This is only compiled in if the faad library is installed.
  */
-void aac_afh_init(struct audio_format_handler *afh)
-{
-	afh->get_file_info = aac_get_file_info,
-	afh->suffixes = aac_suffixes;
-	afh->rewrite_tags = aac_afh_rewrite_tags;
-	afh->open = aac_afh_open;
-	afh->get_chunk = aac_afh_get_chunk;
-	afh->close = aac_afh_close;
-}
+const struct audio_format_handler aac_afh = {
+	.get_file_info = aac_get_file_info,
+	.suffixes = aac_suffixes,
+	.rewrite_tags = aac_afh_rewrite_tags,
+	.open = aac_afh_open,
+	.get_chunk = aac_afh_get_chunk,
+	.close = aac_afh_close,
+};