X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=a3a24bc0b2f4225050ca90b72a059788f3824249;hp=1f3ea6b3040dd9eafe52839a79931b9398c235f7;hb=b829b61f516298a0de3907cd4c30aef189dd8dd4;hpb=298ad3958d76fc775dfd0503ae4b1e43dce70f04 diff --git a/aac_afh.c b/aac_afh.c index 1f3ea6b3..a3a24bc0 100644 --- 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) @@ -191,12 +191,11 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, } /* - * 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) @@ -231,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) {