claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify inlining method in prep for inline tests

Browse Source
This commit is contained in:
Josh Coalson
2007-03-12 05:08:21 +00:00
parent 10a6840138
commit 14b184cced
5 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libFLAC/format.c
View File

@@ -39,6 +39,10 @@
#include "FLAC/format.h"
#include "private/format.h"
#ifndef FLaC__INLINE
#define FLaC__INLINE
#endif
#ifdef min
#undef min
#endif
@@ -294,7 +298,7 @@ FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *se
* and a more clear explanation at the end of this section:
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
*/
static __inline unsigned utf8len_(const FLAC__byte *utf8)
static FLaC__INLINE unsigned utf8len_(const FLAC__byte *utf8)
{
FLAC__ASSERT(0 != utf8);
if ((utf8[0] & 0x80) == 0) {

8
src/libFLAC/stream_encoder.c
View File

@@ -71,6 +71,10 @@
#include "private/stream_encoder_framing.h"
#include "private/window.h"
#ifndef FLaC__INLINE
#define FLaC__INLINE
#endif
#ifdef min
#undef min
#endif
@@ -4068,7 +4072,7 @@ void precompute_partition_info_escapes_(
}
#ifdef EXACT_RICE_BITS_CALCULATION
static __inline unsigned count_rice_bits_in_partition_(
static FLaC__INLINE unsigned count_rice_bits_in_partition_(
const unsigned rice_parameter,
const unsigned partition_samples,
const FLAC__int32 *residual
@@ -4083,7 +4087,7 @@ static __inline unsigned count_rice_bits_in_partition_(
return partition_bits;
}
#else
static __inline unsigned count_rice_bits_in_partition_(
static FLaC__INLINE unsigned count_rice_bits_in_partition_(
const unsigned rice_parameter,
const unsigned partition_samples,
const FLAC__uint64 abs_residual_partition_sum