X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=d5ec442b9bdce9b6507ea9d3c1559d2eee73da22;hp=a3a24bc0b2f4225050ca90b72a059788f3824249;hb=ad14b0d7021aa16a71098eeb70eaba66017ec53a;hpb=5103fd8fb0405b1d52f180f7f1075a17ff292af9;ds=sidebyside diff --git a/aac_afh.c b/aac_afh.c index a3a24bc0..d5ec442b 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,26 +24,26 @@ #include "server.cmdline.h" #include "server.h" -#include "afs.h" +#include "vss.h" #include "afh.h" #include "error.h" #include "string.h" #include "aac.h" #include "fd.h" -/* must be big enough to hold header */ +/** size of the input buffer, must be big enough to hold header */ #define DEFAULT_INBUF_SIZE 65536 static FILE *infile; static int inbuf_size; static unsigned char *inbuf; static size_t inbuf_len; -struct audio_format_handler *af; +static struct audio_format_handler *af; static size_t num_chunks; static size_t entry; static size_t *chunk_table; -NeAACDecHandle handle; +static NeAACDecHandle handle; static void aac_close_audio_file(void) { @@ -116,7 +116,7 @@ static int read_chunk_table(size_t skip) return 1; } -long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC) +static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC) { float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023, ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;