Index: src/libFLAC/include/private/bitreader.h |
diff --git a/src/libFLAC/include/private/bitreader.h b/src/libFLAC/include/private/bitreader.h |
index fd0f6aac6ce3ae3a79e451e5d51a5ca65a07d459..4dea8d03b930618e83ae4994413d73c38f7569d1 100644 |
--- a/src/libFLAC/include/private/bitreader.h |
+++ b/src/libFLAC/include/private/bitreader.h |
@@ -1,5 +1,6 @@ |
/* libFLAC - Free Lossless Audio Codec library |
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson |
+ * Copyright (C) 2000-2009 Josh Coalson |
+ * Copyright (C) 2011-2014 Xiph.Org Foundation |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
@@ -49,7 +50,7 @@ typedef FLAC__bool (*FLAC__BitReaderReadCallback)(FLAC__byte buffer[], size_t *b |
*/ |
FLAC__BitReader *FLAC__bitreader_new(void); |
void FLAC__bitreader_delete(FLAC__BitReader *br); |
-FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__CPUInfo cpu, FLAC__BitReaderReadCallback rcb, void *cd); |
+FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__BitReaderReadCallback rcb, void *cd); |
void FLAC__bitreader_free(FLAC__BitReader *br); /* does not 'free(br)' */ |
FLAC__bool FLAC__bitreader_clear(FLAC__BitReader *br); |
void FLAC__bitreader_dump(const FLAC__BitReader *br, FILE *out); |
@@ -81,19 +82,10 @@ FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, F |
FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val); |
FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter); |
FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter); |
-#ifndef FLAC__NO_ASM |
-# ifdef FLAC__CPU_IA32 |
-# ifdef FLAC__HAS_NASM |
-FLAC__bool FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter); |
-# endif |
-# endif |
-#endif |
#if 0 /* UNUSED */ |
FLAC__bool FLAC__bitreader_read_golomb_signed(FLAC__BitReader *br, int *val, unsigned parameter); |
FLAC__bool FLAC__bitreader_read_golomb_unsigned(FLAC__BitReader *br, unsigned *val, unsigned parameter); |
#endif |
FLAC__bool FLAC__bitreader_read_utf8_uint32(FLAC__BitReader *br, FLAC__uint32 *val, FLAC__byte *raw, unsigned *rawlen); |
FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *val, FLAC__byte *raw, unsigned *rawlen); |
- |
-FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br); |
#endif |