diff options
Diffstat (limited to 'apps/codecs/libffmpegFLAC/shndec.c')
-rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index fb11f77bfa..b107b356d7 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c | |||
@@ -54,22 +54,11 @@ | |||
54 | #define VERBATIM_BYTE_SIZE 8 | 54 | #define VERBATIM_BYTE_SIZE 8 |
55 | #define CANONICAL_HEADER_SIZE 44 | 55 | #define CANONICAL_HEADER_SIZE 44 |
56 | 56 | ||
57 | #define FFMAX(a,b) ((a) > (b) ? (a) : (b)) | ||
58 | #define FFMIN(a,b) ((a) > (b) ? (b) : (a)) | ||
59 | #define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) | 57 | #define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24)) |
60 | 58 | ||
61 | #define get_le16(gb) bswap_16(get_bits_long(gb, 16)) | 59 | #define get_le16(gb) bswap_16(get_bits_long(gb, 16)) |
62 | #define get_le32(gb) bswap_32(get_bits_long(gb, 32)) | 60 | #define get_le32(gb) bswap_32(get_bits_long(gb, 32)) |
63 | 61 | ||
64 | static uint32_t bswap_32(uint32_t x){ | ||
65 | x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF); | ||
66 | return (x>>16) | (x<<16); | ||
67 | } | ||
68 | |||
69 | static uint16_t bswap_16(uint16_t x){ | ||
70 | return (x>>8) | (x<<8); | ||
71 | } | ||
72 | |||
73 | /* converts fourcc string to int */ | 62 | /* converts fourcc string to int */ |
74 | static int ff_get_fourcc(const char *s){ | 63 | static int ff_get_fourcc(const char *s){ |
75 | //assert( strlen(s)==4 ); | 64 | //assert( strlen(s)==4 ); |