Add the mosx Authors to CREDITS

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 601621ed8c99ff22b72b89af3c11f810dd58936c..a3a24bc0b2f4225050ca90b72a059788f3824249 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -25,6 +25,7 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "afs.h"
+#include "afh.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
@@ -113,7 +114,6 @@ static int read_chunk_table(size_t skip)
                        PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
        }
        return 1;
-
 }
 
 long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
@@ -186,16 +186,16 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                "audio_file_info3:\n",
                num_chunks,
                tv2ms(&af->chunk_tv));
+       tv_scale(20, &af->chunk_tv, &af->eof_tv);
        return 1;
 }
 
 /*
- * Simple stream reposition routine
+ * nothing to do as we'll seek to the correct offset in aac read_chunk() anyway
  */
-static int aac_reposition_stream(long unsigned request)
+static int aac_reposition_stream(__a_unused long unsigned request)
 {
        return 1;
-//     return -E_AAC_REPOS;
 }
 
 static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
@@ -230,7 +230,7 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        return (char *)inbuf;
 }
 
-static const char* aac_suffixes[] = {"m4a", NULL};
+static const char* aac_suffixes[] = {"m4a", "mp4", NULL};
 /** the init function of the aac audio format handler */
 void aac_afh_init(struct audio_format_handler *p)
 {
@@ -240,6 +240,5 @@ void aac_afh_init(struct audio_format_handler *p)
        af->read_chunk = aac_read_chunk;
        af->close_audio_file = aac_close_audio_file;
        af->get_header_info = NULL;
-       tv_scale(3, &af->chunk_tv, &af->eof_tv);
        af->suffixes = aac_suffixes;
 }