diff options
| -rw-r--r-- | contrib/libfaad/bits.h | 6 | ||||
| -rw-r--r-- | src/audio_dec/xine_faad_decoder.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/libfaad/bits.h b/contrib/libfaad/bits.h index e303e8e72..4503a792b 100644 --- a/contrib/libfaad/bits.h +++ b/contrib/libfaad/bits.h @@ -35,6 +35,8 @@ extern "C" { #endif +#include "xine/attributes.h" + #include "analysis.h" #ifdef ANALYSIS #include <stdio.h> @@ -108,7 +110,7 @@ static INLINE uint32_t getdword(void *mem) } /* reads only n bytes from the stream instead of the standard 4 */ -static /*INLINE*/ uint32_t getdword_n(void *mem, int n) +static /*INLINE*/ __attr_unused uint32_t getdword_n(void *mem, int n) { uint32_t tmp = 0; #ifndef ARCH_IS_BIG_ENDIAN @@ -266,7 +268,7 @@ static INLINE void faad_flushbits_rev(bitfile *ld, uint32_t bits) } } -static /*INLINE*/ uint32_t faad_getbits_rev(bitfile *ld, uint32_t n +static /*INLINE*/ __attr_unused uint32_t faad_getbits_rev(bitfile *ld, uint32_t n DEBUGDEC) { uint32_t ret; diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c index 61abed51c..c2d24233c 100644 --- a/src/audio_dec/xine_faad_decoder.c +++ b/src/audio_dec/xine_faad_decoder.c @@ -76,7 +76,7 @@ typedef struct faad_decoder_s { unsigned char *dec_config; int dec_config_size; - unsigned long rate; + uint32_t rate; int bits_per_sample; unsigned char num_channels; int sbr; |