View | Details | Raw Unified | Return to bug 73021
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	faac
8
PORTNAME=	faac
9
PORTVERSION=	1.24
9
PORTVERSION=	1.24
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	audio
11
CATEGORIES=	audio
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
13
MASTER_SITE_SUBDIR=	faac
13
MASTER_SITE_SUBDIR=	faac
(-)files/patch-gcc (-41 / +10 lines)
Lines 1-5 Link Here
1
--- include/faac.h.orig	Mon Nov 24 13:10:32 2003
1
--- include/faac.h.orig	Mon Nov 24 13:10:32 2003
2
+++ include/faac.h	Wed Jul 21 14:00:09 2004
2
+++ include/faac.h	Fri Oct 22 20:03:09 2004
3
@@ -36,7 +36,6 @@
3
@@ -36,7 +36,6 @@
4
 # endif
4
 # endif
5
 #endif
5
 #endif
Lines 8-21 Link Here
8
 
8
 
9
 typedef struct {
9
 typedef struct {
10
   void *ptr;
10
   void *ptr;
11
@@ -77,16 +76,11 @@
11
@@ -76,17 +75,16 @@
12
 int FAACAPI faacEncGetDecoderSpecificInfo(faacEncHandle hEncoder, unsigned char **ppBuffer,
12
 					  unsigned long *pSizeOfDecoderSpecificInfo);
13
 					  unsigned long *pSizeOfDecoderSpecificInfo);
13
 
14
 
14
 
15
-
15
-int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
16
 int FAACAPI faacEncEncode(faacEncHandle hEncoder, int32_t * inputBuffer, unsigned int samplesInput,
16
-			 unsigned char *outputBuffer,
17
-			 unsigned char *outputBuffer,
17
-			 unsigned int bufferSize);
18
-			 unsigned int bufferSize);
18
-
19
+                        unsigned char *outputBuffer,
20
+                        unsigned int bufferSize);
21
+
22
 
19
 
23
 
20
 int FAACAPI faacEncClose(faacEncHandle hEncoder);
24
 int FAACAPI faacEncClose(faacEncHandle hEncoder);
21
 
25
 
Lines 26-32 Link Here
26
 #ifdef __cplusplus
30
 #ifdef __cplusplus
27
 }
31
 }
28
--- include/faaccfg.h.orig	Wed Oct 29 05:31:24 2003
32
--- include/faaccfg.h.orig	Wed Oct 29 05:31:24 2003
29
+++ include/faaccfg.h	Wed Jul 21 14:00:09 2004
33
+++ include/faaccfg.h	Fri Oct 22 19:59:53 2004
30
@@ -45,7 +45,6 @@
34
@@ -45,7 +45,6 @@
31
 #define SHORTCTL_NOSHORT   1
35
 #define SHORTCTL_NOSHORT   1
32
 #define SHORTCTL_NOLONG    2
36
 #define SHORTCTL_NOLONG    2
Lines 42-79 Link Here
42
-#pragma pack(pop)
46
-#pragma pack(pop)
43
 
47
 
44
 #endif /* _FAACCFG_H_ */
48
 #endif /* _FAACCFG_H_ */
45
--- libfaac/frame.h.orig	Wed Jul 21 14:08:23 2004
46
+++ libfaac/frame.h	Wed Jul 21 14:08:32 2004
47
@@ -60,7 +60,6 @@
48
   #endif
49
 #endif
50
 
51
-#pragma pack(push, 1)
52
 
53
 typedef struct {
54
   psymodel_t *model;
55
@@ -151,7 +150,6 @@
56
 int FAACAPI faacEncClose(faacEncHandle hEncoder);
57
 
58
 
59
-#pragma pack(pop)
60
 
61
 #ifdef __cplusplus
62
 }
63
--- libfaac/aacquant.h.orig	Wed Jul 21 14:08:45 2004
64
+++ libfaac/aacquant.h	Wed Jul 21 14:08:53 2004
65
@@ -37,14 +37,12 @@
66
 #define POW20(x)  pow(2.0,((double)x)*.25)
67
 #define IPOW20(x)  pow(2.0,-((double)x)*.1875)
68
 
69
-#pragma pack(push, 1)
70
 typedef struct
71
   {
72
     double *pow43;
73
     double *adj43;
74
     double quality;
75
   } AACQuantCfg;
76
-#pragma pack(pop)
77
 
78
 void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
79
 		     AACQuantCfg *aacquantCfg);

Return to bug 73021