Skip to content

Commit 671d947

Browse files
committed
Buildfix
1 parent f9a6873 commit 671d947

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

3rdparty/libflac/bitreader.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,19 @@ FLAC__uint16 FLAC__bitreader_get_read_crc16(FLAC__BitReader *br)
329329
return br->read_crc16;
330330
}
331331

332-
static INLINE FLAC__bool FLAC__bitreader_is_consumed_byte_aligned(const FLAC__BitReader *br)
332+
FLAC__bool FLAC__bitreader_is_consumed_byte_aligned(const FLAC__BitReader *br)
333333
{
334-
return ((br->consumed_bits & 7) == 0);
334+
return ((br->consumed_bits & 7) == 0);
335335
}
336336

337-
static INLINE unsigned FLAC__bitreader_bits_left_for_byte_alignment(const FLAC__BitReader *br)
337+
unsigned FLAC__bitreader_bits_left_for_byte_alignment(const FLAC__BitReader *br)
338338
{
339-
return 8 - (br->consumed_bits & 7);
339+
return 8 - (br->consumed_bits & 7);
340340
}
341341

342-
static INLINE unsigned FLAC__bitreader_get_input_bits_unconsumed(const FLAC__BitReader *br)
342+
unsigned FLAC__bitreader_get_input_bits_unconsumed(const FLAC__BitReader *br)
343343
{
344-
return (br->words-br->consumed_words)*FLAC__BITS_PER_WORD + br->bytes*8 - br->consumed_bits;
344+
return (br->words-br->consumed_words)*FLAC__BITS_PER_WORD + br->bytes*8 - br->consumed_bits;
345345
}
346346

347347
FLAC__bool FLAC__bitreader_read_raw_uint32(FLAC__BitReader *br, FLAC__uint32 *val, unsigned bits)
@@ -455,7 +455,7 @@ FLAC__bool FLAC__bitreader_read_raw_uint64(FLAC__BitReader *br, FLAC__uint64 *va
455455
return true;
456456
}
457457

458-
static INLINE FLAC__bool FLAC__bitreader_read_uint32_little_endian(FLAC__BitReader *br, FLAC__uint32 *val)
458+
FLAC__bool FLAC__bitreader_read_uint32_little_endian(FLAC__BitReader *br, FLAC__uint32 *val)
459459
{
460460
FLAC__uint32 x8, x32 = 0;
461461

3rdparty/libflac/bitwriter.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void FLAC__bitwriter_release_buffer(FLAC__BitWriter *bw)
267267
(void)bw;
268268
}
269269

270-
static INLINE FLAC__bool FLAC__bitwriter_write_zeroes(FLAC__BitWriter *bw, unsigned bits)
270+
FLAC__bool FLAC__bitwriter_write_zeroes(FLAC__BitWriter *bw, unsigned bits)
271271
{
272272
unsigned n;
273273

@@ -305,7 +305,7 @@ static INLINE FLAC__bool FLAC__bitwriter_write_zeroes(FLAC__BitWriter *bw, unsig
305305
return true;
306306
}
307307

308-
static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32(FLAC__BitWriter *bw, FLAC__uint32 val, unsigned bits)
308+
FLAC__bool FLAC__bitwriter_write_raw_uint32(FLAC__BitWriter *bw, FLAC__uint32 val, unsigned bits)
309309
{
310310
register unsigned left;
311311

@@ -344,7 +344,7 @@ static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32(FLAC__BitWriter *bw, F
344344
return true;
345345
}
346346

347-
static INLINE FLAC__bool FLAC__bitwriter_write_raw_int32(FLAC__BitWriter *bw, FLAC__int32 val, unsigned bits)
347+
FLAC__bool FLAC__bitwriter_write_raw_int32(FLAC__BitWriter *bw, FLAC__int32 val, unsigned bits)
348348
{
349349
/* zero-out unused bits */
350350
if(bits < 32)
@@ -353,7 +353,7 @@ static INLINE FLAC__bool FLAC__bitwriter_write_raw_int32(FLAC__BitWriter *bw, FL
353353
return FLAC__bitwriter_write_raw_uint32(bw, (FLAC__uint32)val, bits);
354354
}
355355

356-
static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint64(FLAC__BitWriter *bw, FLAC__uint64 val, unsigned bits)
356+
FLAC__bool FLAC__bitwriter_write_raw_uint64(FLAC__BitWriter *bw, FLAC__uint64 val, unsigned bits)
357357
{
358358
/* this could be a little faster but it's not used for much */
359359
if(bits > 32) {
@@ -365,7 +365,7 @@ static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint64(FLAC__BitWriter *bw, F
365365
return FLAC__bitwriter_write_raw_uint32(bw, (FLAC__uint32)val, bits);
366366
}
367367

368-
static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32_little_endian(FLAC__BitWriter *bw, FLAC__uint32 val)
368+
FLAC__bool FLAC__bitwriter_write_raw_uint32_little_endian(FLAC__BitWriter *bw, FLAC__uint32 val)
369369
{
370370
/* this doesn't need to be that fast as currently it is only used for vorbis comments */
371371

@@ -381,7 +381,7 @@ static INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32_little_endian(FLAC__Bi
381381
return true;
382382
}
383383

384-
static INLINE FLAC__bool FLAC__bitwriter_write_byte_block(FLAC__BitWriter *bw, const FLAC__byte vals[], unsigned nvals)
384+
FLAC__bool FLAC__bitwriter_write_byte_block(FLAC__BitWriter *bw, const FLAC__byte vals[], unsigned nvals)
385385
{
386386
unsigned i;
387387

0 commit comments

Comments
 (0)