Rename struct audio_format_info to afh_info.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index d0d437e90a31bade448b3a31165bf82dfe15d2ea..f679af29de6e54efe0d1fd6dbef94eab61314a30 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -11,10 +11,11 @@
 /** \file aac_afh.c para_server's aac audio format handler */
 
 #include "para.h"
-#include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afh.h"
+#include "afs.h"
+#include "server.h"
 #include "aac.h"
 
 static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
@@ -41,7 +42,7 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
        return -E_STSZ;
 }
 
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+static ssize_t aac_compute_chunk_table(struct afh_info *afi,
                unsigned char *map, size_t numbytes)
 {
        int ret, i;
@@ -66,7 +67,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
        return skip;
 }
 
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afi,
                mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
        float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
@@ -92,7 +93,7 @@ static int aac_set_chunk_tv(struct audio_format_info *afi,
  * Init m4a file and write some tech data to given pointers.
  */
 static int aac_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afi)
 {
        int i;
        size_t skip;