Unified · Split
| @@ -51,10 +51,6 @@ psymodellist_t; · 50 unmodified lines | |||
| 51 | 51 | ||
| 52 | typedef void *faacEncHandle; | 52 | typedef void *faacEncHandle; |
| 53 | 53 | ||
| 54 | #ifndef HAVE_INT32_T | ||
| 55 | typedef signed int int32_t; | ||
| 56 | #endif | ||
| 57 | |||
| 58 | /* | 54 | /* |
| 59 | Allows an application to get FAAC version info. This is intended | 55 | Allows an application to get FAAC version info. This is intended |
| 60 | purely for informative purposes. | 56 | purely for informative purposes. |
| @@ -16,7 +16,6 @@ · 15 unmodified lines | |||
| 16 | * License along with this library; if not, write to the Free Software | 16 | * License along with this library; if not, write to the Free Software |
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | * | 18 | * |
| 19 | * $Id: frame.h,v 1.32 2012/03/01 18:34:17 knik Exp $ | ||
| 20 | */ | 19 | */ |
| 21 | 20 | ||
| 22 | #ifndef FRAME_H | 21 | #ifndef FRAME_H |
| @@ -26,22 +25,10 @@ · 3 unmodified lines | |||
| 26 | #include "config.h" | 25 | #include "config.h" |
| 27 | #endif | 26 | #endif |
| 28 | 27 | ||
| 29 | #ifdef HAVE_SYS_TYPES_H | 28 | #include <stdint.h> |
| 30 | # include <sys/types.h> | ||
| 31 | #endif | ||
| 32 | #ifdef HAVE_INTTYPES_H | ||
| 33 | # include <inttypes.h> | ||
| 34 | #endif | ||
| 35 | #ifdef HAVE_STDINT_H | ||
| 36 | # include <stdint.h> | ||
| 37 | #endif | ||
| 38 | 29 | ||
| 39 | #include <faac.h> | 30 | #include <faac.h> |
| 40 | 31 | ||
| 41 | #ifndef HAVE_INT32_T | ||
| 42 | typedef signed int int32_t; | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #ifdef __cplusplus | 32 | #ifdef __cplusplus |
| 46 | extern "C" { | 33 | extern "C" { |
| 47 | #endif /* __cplusplus */ | 34 | #endif /* __cplusplus */ |
| @@ -32,8 +32,6 @@ typedef struct · 31 unmodified lines | |||
| 32 | int pnslevel; | 32 | int pnslevel; |
| 33 | } AACQuantCfg; | 33 | } AACQuantCfg; |
| 34 | 34 | ||
| 35 | #include "quantize.h" | ||
| 36 | |||
| 37 | enum { | 35 | enum { |
| 38 | DEFQUAL = 100, | 36 | DEFQUAL = 100, |
| 39 | MAXQUAL = 5000, | 37 | MAXQUAL = 5000, |