1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From 8d56571c212df7bc4fdbade79406e29c1d3d286d Mon Sep 17 00:00:00 2001
From: Krzysztof Nikiel <knik@users.sourceforge.net>
Date: Tue, 28 Nov 2017 11:58:27 +0100
Subject: [PATCH 3/7] a little cleanup and compilation fix
---
include/faac.h | 4 ----
libfaac/frame.h | 15 +--------------
libfaac/quantize.h | 2 --
3 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/include/faac.h b/include/faac.h
index 688c265..a67b11b 100644
--- a/include/faac.h
+++ b/include/faac.h
@@ -51,10 +51,6 @@ psymodellist_t;
typedef void *faacEncHandle;
-#ifndef HAVE_INT32_T
-typedef signed int int32_t;
-#endif
-
/*
Allows an application to get FAAC version info. This is intended
purely for informative purposes.
diff --git a/libfaac/frame.h b/libfaac/frame.h
index 75e94eb..87d5ff0 100644
--- a/libfaac/frame.h
+++ b/libfaac/frame.h
@@ -16,7 +16,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: frame.h,v 1.32 2012/03/01 18:34:17 knik Exp $
*/
#ifndef FRAME_H
@@ -26,22 +25,10 @@
#include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
#include <faac.h>
-#ifndef HAVE_INT32_T
-typedef signed int int32_t;
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
diff --git a/libfaac/quantize.h b/libfaac/quantize.h
index 2aad15b..b31071e 100644
--- a/libfaac/quantize.h
+++ b/libfaac/quantize.h
@@ -32,8 +32,6 @@ typedef struct
int pnslevel;
} AACQuantCfg;
-#include "quantize.h"
-
enum {
DEFQUAL = 100,
MAXQUAL = 5000,
--
2.18.0
|
