diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-05 17:35:54 -0800 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-18 22:49:31 +0200 |
| commit | f18d1a93390fedbb03f81db82322215ce027c1e0 (patch) | |
| tree | fa607172a51170011043a907c3a475da4c60c24a /libFLAC/include/private/crc.h | |
| parent | 686d6ff2afda2ea3211bec37ad0daa655c24e6d4 (diff) | |
| download | external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.zip external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.tar.gz external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.tar.bz2 | |
libFLAC: merge master from Xiph
remote: https://git.xiph.org/flac.git
commit: 775eb93
Bug: 18872897
Bug: 18910747
Change-Id: I6e450e44c96b97c3323e428b9e6d420422f24a4e
(cherry picked from commit 31e4f3166a91a2ebb34f643787122a638d9f1471)
Tested-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'libFLAC/include/private/crc.h')
| -rw-r--r-- | libFLAC/include/private/crc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libFLAC/include/private/crc.h b/libFLAC/include/private/crc.h index 0b67fb4..29c512c 100644 --- a/libFLAC/include/private/crc.h +++ b/libFLAC/include/private/crc.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 @@ -48,9 +49,9 @@ FLAC__uint8 FLAC__crc8(const FLAC__byte *data, unsigned len); ** polynomial = x^16 + x^15 + x^2 + x^0 ** init = 0 */ -extern unsigned FLAC__crc16_table[256]; +extern unsigned const FLAC__crc16_table[256]; -#define FLAC__CRC16_UPDATE(data, crc) (((((crc)<<8) & 0xffff) ^ FLAC__crc16_table[((crc)>>8) ^ (data)])) +#define FLAC__CRC16_UPDATE(data, crc) ((((crc)<<8) & 0xffff) ^ FLAC__crc16_table[((crc)>>8) ^ (data)]) /* this alternate may be faster on some systems/compilers */ #if 0 #define FLAC__CRC16_UPDATE(data, crc) ((((crc)<<8) ^ FLAC__crc16_table[((crc)>>8) ^ (data)]) & 0xffff) |