summaryrefslogtreecommitdiff
path: root/src/libfaad/common.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-12 14:58:46 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-04-12 14:58:46 +0000
commitc40876878a3e1743738f4ce813330812d8bf49f0 (patch)
tree98a2b74bd2cb014b25a395e186a579687ce59447 /src/libfaad/common.h
parent7be172b50ab8d2c90ac818bfe721e70c274d9880 (diff)
downloadxine-lib-c40876878a3e1743738f4ce813330812d8bf49f0.tar.gz
xine-lib-c40876878a3e1743738f4ce813330812d8bf49f0.tar.bz2
sync to faad2 cvs, remove some warnings.
CVS patchset: 4592 CVS date: 2003/04/12 14:58:46
Diffstat (limited to 'src/libfaad/common.h')
-rw-r--r--src/libfaad/common.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libfaad/common.h b/src/libfaad/common.h
index 82b1d33d2..4683121e5 100644
--- a/src/libfaad/common.h
+++ b/src/libfaad/common.h
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: common.h,v 1.6 2003/01/31 01:20:27 storri Exp $
+** $Id: common.h,v 1.7 2003/04/12 14:58:46 miguelfreitas Exp $
**/
#ifndef __COMMON_H__
@@ -55,7 +55,7 @@ extern "C" {
/* Allow decoding of MAIN profile AAC */
#define MAIN_DEC
/* Allow decoding of SSR profile AAC */
-#define SSR_DEC
+//#define SSR_DEC
/* Allow decoding of LTP profile AAC */
#define LTP_DEC
/* Allow decoding of LD profile AAC */
@@ -259,6 +259,9 @@ typedef real_t complex_t[2];
/* common functions */
uint32_t int_log2(uint32_t val);
+uint8_t get_sr_index(uint32_t samplerate);
+int8_t can_decode_ot(uint8_t object_type);
+
#ifndef M_PI
#define M_PI 3.14159265358979323846f
#endif