X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=9cc94f4c1a1f86515f771f2b3a2254f8494f7cf4;hp=061642aeaa7db199525e87fcda9059c1f939932c;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=a694ab16b6ff43b545ccd530360b7224433a5b76 diff --git a/wmadec_filter.c b/wmadec_filter.c index 061642ae..9cc94f4c 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "para.h" #include "error.h" @@ -32,6 +33,7 @@ #include "ggo.h" #include "string.h" #include "sched.h" +#include "buffer_tree.h" #include "filter.h" #include "bitstream.h" #include "imdct.h" @@ -148,7 +150,7 @@ struct private_wmadec_data { #define VLCBITS 9 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS) -#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16) +#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16) SINE_WINDOW(128); SINE_WINDOW(256); @@ -1179,9 +1181,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data, goto fail; samples += pwd->ahi.channels * pwd->frame_len; } - PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %zd, eaten: %d\n", + PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %d, eaten: %d\n", pwd->frame_len, pwd->block_len, - (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align); + (int)((int8_t *)samples - (int8_t *)data), pwd->ahi.block_align); *data_size = (int8_t *)samples - (int8_t *)data; return pwd->ahi.block_align; fail: