Merge commit 'meins/master'

[paraslash.git] / aac.h

diff --git a/aac.h b/aac.h
index 0cfa0105bef6c83c3e5f537a8aad617ab07ebb39..1efe75aceeb3a3935acfc21b50fd548344c09306 100644 (file)
--- a/aac.h
+++ b/aac.h
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
- *     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.
  */
 
 /** \file aac.h exported symbols from aac_common.c */
@@ -21,6 +9,12 @@
 #include <neaacdec.h>
 
 NeAACDecHandle aac_open(void);
-int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip);
-int aac_find_entry_point(unsigned char *buf, unsigned buflen, int *skip);
-unsigned aac_read_int32(unsigned char *buf);
+int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
+               unsigned long *decoder_length);
+ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip);
+
+static inline unsigned aac_read_int32(unsigned char *buf)
+{
+       uint8_t *d = (uint8_t*)buf;
+       return (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
+}