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
|
--- src/liba52/a52_internal.h Sun Jul 28 03:52:06 2002
+++ src/liba52/a52_internal.h Wed Aug 28 19:01:05 2002
@@ -84,6 +84,7 @@
expbap_t lfe_expbap;
sample_t * samples;
+ void * samples_base;
int downmixed;
};
--- src/liba52/imdct.c Sun Jul 28 03:52:07 2002
+++ src/liba52/imdct.c Wed Aug 28 18:55:38 2002
@@ -38,7 +38,7 @@
#include "a52.h"
#include "a52_internal.h"
-#include "mm_accel.h"
+#include "xineutils.h"
typedef struct complex_s {
sample_t real;
@@ -425,7 +425,6 @@
} else
#endif
{
- fprintf (stderr, "liba52:No accelerated IMDCT transform found\n");
ifft128 = ifft128_c;
ifft64 = ifft64_c;
}
--- src/liba52/parse.c Sun Jul 28 03:52:07 2002
+++ src/liba52/parse.c Wed Aug 28 19:02:21 2002
@@ -31,14 +31,7 @@
#include "a52_internal.h"
#include "bitstream.h"
#include "tables.h"
-
-#ifdef HAVE_MEMALIGN
-/* some systems have memalign() but no declaration for it */
-void * memalign (size_t align, size_t size);
-#else
-/* assume malloc alignment is sufficient */
-#define memalign(align,size) malloc (size)
-#endif
+#include "xineutils.h"
typedef struct {
sample_t q1[2];
@@ -60,7 +53,7 @@
if (state == NULL)
return NULL;
- state->samples = memalign (16, 256 * 12 * sizeof (sample_t));
+ state->samples = xine_xmalloc_aligned (16, 256 * 12 * sizeof (sample_t), &state->samples_base);
if (state->samples == NULL) {
free (state);
return NULL;
@@ -896,6 +889,6 @@
void a52_free (a52_state_t * state)
{
- free (state->samples);
+ free (state->samples_base);
free (state);
}
--- src/liba52/bitstream.h
+++ src/liba52/bitstream.h
@@ -21,6 +21,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef WIN32
+#include <unistd.h>
+#endif
+
/* (stolen from the kernel) */
#ifdef WORDS_BIGENDIAN
|
