X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=85bad6d98ce8eb80c0d35ba3d1d4cbdce8e5fdc3;hb=77960b7b4c6e5b03c5ef2fe897c5e00395b9ae15;hp=0a352c886164e858001fec0397da3aba7cab7cfb;hpb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44;p=paraslash.git diff --git a/aac_afh.c b/aac_afh.c index 0a352c88..85bad6d9 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,19 +1,7 @@ /* * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /* * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker, @@ -22,6 +10,8 @@ /** \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" @@ -110,7 +100,7 @@ static int aac_get_file_info(char *map, size_t numbytes, unsigned long rate = 0, decoder_len; unsigned char channels = 0; mp4AudioSpecificConfig mp4ASC; - NeAACDecHandle handle; + NeAACDecHandle handle = NULL; unsigned char *umap = (unsigned char *) map; ret = aac_find_esds(umap, numbytes, &skip, &decoder_len); @@ -156,6 +146,8 @@ static int aac_get_file_info(char *map, size_t numbytes, tv_scale(20, &afi->chunk_tv, &afi->eof_tv); ret = 1; out: + if (handle) + NeAACDecClose(handle); return ret; }