summaryrefslogtreecommitdiff
path: root/src/libfaad/faad.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libfaad/faad.h')
-rw-r--r--src/libfaad/faad.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libfaad/faad.h b/src/libfaad/faad.h
index 31f8e13f1..640f66de1 100644
--- a/src/libfaad/faad.h
+++ b/src/libfaad/faad.h
@@ -1,6 +1,6 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
**
** 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
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: faad.h,v 1.5 2003/12/30 02:00:10 miguelfreitas Exp $
+** $Id: faad.h,v 1.6 2004/01/26 22:34:10 jstembridge Exp $
**/
#ifndef __AACDEC_H__
@@ -138,6 +138,7 @@ typedef struct faacDecConfiguration
unsigned char outputFormat;
unsigned char downMatrix;
unsigned char useOldADTSFormat;
+ unsigned char dontUpSampleImplicitSBR;
} faacDecConfiguration, *faacDecConfigurationPtr;
typedef struct faacDecFrameInfo
@@ -167,9 +168,9 @@ typedef struct faacDecFrameInfo
char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);
-unsigned long FAADAPI faacDecGetCapabilities();
+unsigned long FAADAPI faacDecGetCapabilities(void);
-faacDecHandle FAADAPI faacDecOpen();
+faacDecHandle FAADAPI faacDecOpen(void);
faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);