diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-09 19:10:58 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-09 19:10:58 +0100 |
| commit | 8063ffb8c0b354d54834ba53b22003dac481de2c (patch) | |
| tree | 2663524c8c6376ab1ee7dd2a620b0979fc80ddb3 /contrib | |
| parent | 39939c95eff90545285a9a8f761d9fa6e9349358 (diff) | |
| download | xine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.gz xine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.bz2 | |
Compilation fixes, mostly ffmpeg-related, and linkage fixes.
Tests done on amd64 with ffmpeg 0.svn20080206 from Debian experimental.
libavcodec 51.50.0, libavutil 49.6.0, libpostproc 51.1.0
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/a52dec/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/a52dec/parse.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/contrib/a52dec/Makefile.am b/contrib/a52dec/Makefile.am index 6eebd58be..6da10ec84 100644 --- a/contrib/a52dec/Makefile.am +++ b/contrib/a52dec/Makefile.am @@ -8,5 +8,5 @@ endif liba52_la_SOURCES = bitstream.c bit_allocate.c downmix.c imdct.c parse.c \ a52.h a52_internal.h bitstream.h tables.h crc.c -liba52_la_LIBADD = -lm -liba52_la_CPPFLAGS = $(AM_CPPFLAGS) +liba52_la_LIBADD = -lm $(AVUTIL_LIBS) +liba52_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVUTIL_CFLAGS) diff --git a/contrib/a52dec/parse.c b/contrib/a52dec/parse.c index 7aba1d809..82e29121b 100644 --- a/contrib/a52dec/parse.c +++ b/contrib/a52dec/parse.c @@ -32,6 +32,7 @@ #include "bitstream.h" #include "tables.h" #include <xine/xineutils.h> +#include <mem.h> typedef struct { sample_t q1[2]; @@ -53,15 +54,13 @@ a52_state_t * a52_init (uint32_t mm_accel) if (state == NULL) return NULL; - state->samples = xine_xmalloc_aligned (16, 256 * 12 * sizeof (sample_t), &state->samples_base); + state->samples_base = state->samples = av_mallocz (256 * 12 * sizeof (sample_t)); + if (state->samples == NULL) { free (state); return NULL; } - for (i = 0; i < 256 * 12; i++) - state->samples[i] = 0; - state->downmixed = 1; state->lfsr_state = 1; |