diff options
author | Josh Coalson <jcoalson@users.sourceforce.net> | 2007-06-16 00:50:28 +0000 |
---|---|---|
committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2007-06-16 00:50:28 +0000 |
commit | b47ab0d25059cd053e1da1fbc79011b92642524e (patch) | |
tree | 35a7156f1a98bf0818647884fe60ff98e5b9f23c /src/libFLAC/stream_encoder_framing.c | |
parent | 5c24bb88ecccb86130c0cc19c5d0e5895a047fed (diff) | |
download | flac-b47ab0d25059cd053e1da1fbc79011b92642524e.tar.gz |
merge decoder part from RICE_EXT_BRANCH: blocking strategy bit, new rice2 ecm, frame header support for 88.2/176.4/192kHz, new reserved bit, deprecated blocksize-from-streaminfo bit
Diffstat (limited to 'src/libFLAC/stream_encoder_framing.c')
-rw-r--r-- | src/libFLAC/stream_encoder_framing.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libFLAC/stream_encoder_framing.c b/src/libFLAC/stream_encoder_framing.c index 8b9558b1..6873dfc4 100644 --- a/src/libFLAC/stream_encoder_framing.c +++ b/src/libFLAC/stream_encoder_framing.c @@ -229,6 +229,9 @@ FLAC__bool FLAC__frame_add_header(const FLAC__FrameHeader *header, FLAC__BitWrit if(!FLAC__bitwriter_write_raw_uint32(bw, 0, FLAC__FRAME_HEADER_RESERVED_LEN)) return false; + if(!FLAC__bitwriter_write_raw_uint32(bw, 0, FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN)) + return false; + FLAC__ASSERT(header->blocksize > 0 && header->blocksize <= FLAC__MAX_BLOCK_SIZE); /* when this assertion holds true, any legal blocksize can be expressed in the frame header */ FLAC__ASSERT(FLAC__MAX_BLOCK_SIZE <= 65535u); |